Fix merge issue

cosmos · Dec 1, 2023 · 82afb87 · 82afb87
1 parent ac352d4
commit 82afb87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile-Consumer b/Dockerfile-Consumer
@@ -57,13 +57,13 @@ COPY --from=cometmock-builder /usr/local/bin/cometmock /usr/local/bin/cometmock
 COPY --from=gorelayer-builder /bin/rly /usr/local/bin/
 
 # Copy consumer from specified image
-COPY --from=consumer /usr/local/bin/interchain-security-pd /usr/local/bin/interchain-security-pd
-COPY --from=consumer /testnet-scripts /provider-${CONSUMER_VERSION}/testnet-scripts
+COPY --from=consumer /usr/local/bin/interchain-security-cd /usr/local/bin/interchain-security-cd
+COPY --from=consumer /usr/local/bin/interchain-security-cdd /usr/local/bin/interchain-security-cdd
+COPY --from=consumer /usr/local/bin/interchain-security-sd /usr/local/bin/interchain-security-sd
+COPY --from=consumer /testnet-scripts /consumer-${CONSUMER_VERSION}/testnet-scripts
 
 # Copy provider from local build
-COPY --from=is-builder /go/bin/interchain-security-cd /usr/local/bin/interchain-security-cd
-COPY --from=is-builder /go/bin/interchain-security-cdd /usr/local/bin/interchain-security-cdd
-COPY --from=is-builder /go/bin/interchain-security-sd /usr/local/bin/interchain-security-sd
+COPY --from=is-builder /go/bin/interchain-security-pd /usr/local/bin/interchain-security-pd
 
 # Copy in the shell scripts that run the testnet
 ADD ./tests/e2e/testnet-scripts /testnet-scripts

diff --git a/tests/e2e/main.go b/tests/e2e/main.go
@@ -134,11 +134,11 @@ func executeTests(tests []testStepsWithConfig) (err error) {
 			wg.Add(1)
 			go func(run testStepsWithConfig) {
 				defer wg.Done()
-				run.testRun.Run(run.steps, *localSdkPath, *useGaia, *gaiaTag, *useConsumerVersion, *useProviderVersion)
+				run.testRun.Run(run.steps, *localSdkPath, *useGaia, *gaiaTag, *useConsumerVersion, *useProviderVersion, *transformGenesis)
 			}(testCase)
 		} else {
 			log.Printf("=============== running %s ===============\n", testCase.testRun.name)
-			testCase.testRun.Run(testCase.steps, *localSdkPath, *useGaia, *gaiaTag, *useConsumerVersion, *useProviderVersion)
+			testCase.testRun.Run(testCase.steps, *localSdkPath, *useGaia, *gaiaTag, *useConsumerVersion, *useProviderVersion, *transformGenesis)
 		}
 	}
 
@@ -286,7 +286,7 @@ func main() {
 	if err := parseArguments(); err != nil {
 		flag.Usage()
 		log.Fatalf("Error parsing command arguments %s\n", err)
-		}
+	}
 
 	if *useConsumerVersion != "" && *useProviderVersion != "" {
 		log.Fatalf("consumer-version & provider-version specified! Note: for compatibility tests current checked out version can only be tested against a different provider or consumer version")