From eb4c36eb46b366cdc50d1f5f965e3d27750141dd Mon Sep 17 00:00:00 2001 From: Bernd Mueller Date: Tue, 5 Dec 2023 19:07:36 +0100 Subject: [PATCH] cleanup --- tests/e2e/actions.go | 4 ++-- tests/e2e/testnet-scripts/start-docker.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index b324082eb8..37ffa70c69 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -514,9 +514,9 @@ func (tr *TestConfig) startConsumerChain( log.Fatal(err, "\n", string(bz)) } - // only needed when consumer is running v3.2.x and later + // only needed when consumer is running v3.3.x and later if tr.transformGenesis { - log.Printf("@@@@ Transforming consumer genesis for a newer version: %s\n", tr.consumerVersion) + log.Printf("Transforming consumer genesis for a newer version: %s\n", tr.consumerVersion) log.Printf("Original ccv genesis: %s\n", string(bz)) file, err := os.Create("consumer_genesis.json") diff --git a/tests/e2e/testnet-scripts/start-docker.sh b/tests/e2e/testnet-scripts/start-docker.sh index 4ed0f0a70c..59b5800b6f 100755 --- a/tests/e2e/testnet-scripts/start-docker.sh +++ b/tests/e2e/testnet-scripts/start-docker.sh @@ -65,20 +65,20 @@ if [[ ${USE_GAIA_TAG+x} ]] then printf "\n\nUsing gaia as provider\n\n" printf "\n\nUsing gaia tag %s\n\n" "$USE_GAIA_TAG" - docker build -f Dockerfile.gaia -t "$CONTAINER_NAME" --build-arg USE_GAIA_TAG="$USE_GAIA_TAG" ./ + docker build -f Dockerfile.gaia -t "$CONTAINER_NAME" --build-arg USE_GAIA_TAG="$USE_GAIA_TAG" . elif [ ${CONSUMER_VERSION+x} ] && [ ${PROVIDER_VERSION+x} ]; then printf "\n\nUsing ICS consumer app from image version ${CONSUMER_VERSION} and provider from image version ${PROVIDER_VERSION}" - docker build -f Dockerfile-Combined --build-arg PROVIDER_VERSION="${PROVIDER_VERSION}" --build-arg CONSUMER_VERSION="${CONSUMER_VERSION}" -t "$CONTAINER_NAME" ./ + docker build -f Dockerfile-Combined --build-arg PROVIDER_VERSION="${PROVIDER_VERSION}" --build-arg CONSUMER_VERSION="${CONSUMER_VERSION}" -t "$CONTAINER_NAME" . elif [ ${CONSUMER_VERSION+x} ]; then printf "\n\nUsing ICS consumer app from image version ${CONSUMER_VERSION}" - docker build -f Dockerfile-Consumer --build-arg CONSUMER_VERSION="${CONSUMER_VERSION}" -t "$CONTAINER_NAME" ./ + docker build -f Dockerfile-Consumer --build-arg CONSUMER_VERSION="${CONSUMER_VERSION}" -t "$CONTAINER_NAME" . elif [ ${PROVIDER_VERSION+x} ]; then printf "\n\nUsing ICS provider app from image version ${PROVIDER_VERSION}" - docker build -f Dockerfile-Provider --build-arg PROVIDER_VERSION="${PROVIDER_VERSION}" -t "$CONTAINER_NAME" ./ + docker build -f Dockerfile-Provider --build-arg PROVIDER_VERSION="${PROVIDER_VERSION}" -t "$CONTAINER_NAME" . else printf "\n\nUsing ICS provider app as provider\n\n\n" - docker build -f Dockerfile -t "$CONTAINER_NAME" ./ + docker build -f Dockerfile -t "$CONTAINER_NAME" . fi # Remove copied sdk directory