From ae57c9c84e430eac2f0c6dc5a90cfcab5c49294f Mon Sep 17 00:00:00 2001 From: Piotr Date: Wed, 15 Dec 2021 17:55:20 +0100 Subject: [PATCH] Fix: `env-check` image reference on master (#98) * X-Smart-Branch-Parent: master * Fix tag-prefix for env-check image --- .circleci/config.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 427ee61c..63de016c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,7 +115,11 @@ jobs: name: Run unit tests for circleci-tools using the built image command: | export TAG="$(git describe --tags --abbrev=10)" - export IMAGE="quay.io/rhacs-eng/apollo-ci:snapshot-env-check-$TAG" + tag_prefix="snapshot-env-check-" + if [[ $CIRCLE_BRANCH = master || -n $CIRCLE_TAG ]]; then + tag_prefix="env-check-" + fi + export IMAGE="quay.io/rhacs-eng/apollo-ci:${tag_prefix}${TAG}" docker pull "$IMAGE" images/circleci-tools/test/test.bats @@ -134,7 +138,11 @@ jobs: name: Check build output using the built image command: | export TAG="$(git describe --tags --abbrev=10)" - export IMAGE="quay.io/rhacs-eng/apollo-ci:snapshot-env-check-$TAG" + tag_prefix="snapshot-env-check-" + if [[ $CIRCLE_BRANCH = master || -n $CIRCLE_TAG ]]; then + tag_prefix="env-check-" + fi + export IMAGE="quay.io/rhacs-eng/apollo-ci:${tag_prefix}${TAG}" export CIRCLECI_TOKEN="$CIRCLE_TOKEN_ROXBOT" docker pull "$IMAGE"