Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bermuell committed Dec 5, 2023
1 parent c68df6f commit eb4c36e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions tests/e2e/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/testnet-scripts/start-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eb4c36e

Please sign in to comment.