x

.github/workflows/test.yml

@@ -26,7 +26,9 @@ jobs:
           go-version: "1.22"
           check-latest: true
           cache: true
-          cache-dependency-path: go.sum
+          cache-dependency-path: | 
+            simapp/go.sum
+            systemtest/go.sum
       - uses: technote-space/get-diff-action@v6.1.2
         id: git_diff
         with:

systemtests/system.go

@@ -528,14 +528,22 @@ func (s *SystemUnderTest) ForEachNodeExecAndWait(t *testing.T, cmds ...[]string)
 }
 
 func runShellCmd(t *testing.T, cmd string, args ...string) string {
+	out, err := runShellCmdX(cmd, args...)
+	require.NoError(t, err)
+	return out
+}
+
+func runShellCmdX(cmd string, args ...string) (string, error) {
 	c := exec.Command( //nolint:gosec
 		locateExecutable(cmd),
 		args...,
 	)
 	c.Dir = WorkDir
 	out, err := c.CombinedOutput()
-	require.NoError(t, err, "exec %q: %s", cmd, string(out))
-	return string(out)
+	if err != nil {
+		return string(out), fmt.Errorf("run `%s %s`: out: %s: %w", cmd, strings.Join(args, " "), string(out), err)
+	}
+	return string(out), nil
 }
 
 // startNodesAsync runs the given app cli command for all cluster nodes and returns without waiting
@@ -727,7 +735,7 @@ func locateExecutable(file string) string {
 		panic(fmt.Sprintf("unexpected error with file %q: %s", file, err.Error()))
 	}
 	if path == "" {
-		panic(fmt.Sprintf("%q not founc", file))
+		panic(fmt.Sprintf("%q not found", file))
 	}
 	return path
 }

systemtests/testnet_init.go

@@ -96,13 +96,24 @@ func (s LegacyTestnetInitializer) Initialize() {
 		"--minimum-gas-prices=" + s.minGasPrice,
 	}
 	fmt.Printf("+++ %s %s\n", s.execBinary, strings.Join(args, " "))
-	cmd := exec.Command( //nolint:gosec
-		locateExecutable(s.execBinary),
-		args...,
-	)
-	cmd.Dir = s.workDir
-	out := mustV(cmd.CombinedOutput())
-	s.log(string(out))
+	executable := locateExecutable(s.execBinary)
+	out, err := runShellCmdX("ls", "-la", "/home/runner/work/cosmos-sdk/cosmos-sdk/systemtests/binaries")
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println("+++ debug: " + out)
+	executable = locateExecutable(s.execBinary)
+	out, err = runShellCmdX(s.execBinary, "version")
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(out)
+
+	out, err = runShellCmdX(executable, args...)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(out)
 
 	nodeAddresses := make([]string, s.initialNodesCount)
 	for i := 0; i < s.initialNodesCount; i++ {

systemtests/upgrade_test.go

@@ -21,6 +21,7 @@ func TestChainUpgrade(t *testing.T) {
 	// start a legacy chain with some state
 	// when a chain upgrade proposal is executed
 	// then the chain upgrades successfully
+	sut.StopChain()
 
 	legacyBinary := FetchExecutable(t, "v0.50")
 	t.Logf("+++ legacy binary: %s\n", legacyBinary)
@@ -99,14 +100,16 @@ func FetchExecutable(t *testing.T, version string) string {
 		panic(err)
 	}
 
-	cacheFile := filepath.Join(cacheFolder, fmt.Sprintf("%s_%s", execBinaryName, version))
+	cacheFile := filepath.Join(cacheFolder, fmt.Sprintf("%s_alx", execBinaryName))
+	//cacheFile := filepath.Join(cacheFolder, fmt.Sprintf("%s_%s", execBinaryName, version))
 	if _, err := os.Stat(cacheFile); err == nil {
 		return cacheFile
 	}
-	destFile := filepath.Join(cacheFolder, "simd_"+version)
+	destFile := cacheFile
 	t.Log("+++ version not in cache, downloading from docker image")
 	runShellCmd(t, "docker", "pull", "ghcr.io/cosmos/simapp:"+version)
 	runShellCmd(t, "docker", "create", "--name=ci_temp", "ghcr.io/cosmos/simapp:"+version)
 	runShellCmd(t, "docker", "cp", "ci_temp:/usr/bin/simd", destFile)
+	t.Logf("ls %q: %s\n", cacheFolder, runShellCmd(t, "ls", "-la", cacheFolder))
 	return destFile
 }