Merge pull request #212 from Scalr/feature/SCALRCORE-25384

SCALRCORE-25384: GH Actions: Fix scalr_server_image_tag when scalr-se…
Scalr · Feb 15, 2023 · a529b6e · a529b6e
2 parents f6f27ec + c6db84b
commit a529b6e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -88,6 +88,7 @@ jobs:
         id: create
         shell: bash
         run: |
+          echo "::group::Analyze branches"
           if [ -z ${{ env.API_BRANCH }} ]; then
             FATMOUSE_BRANCH=""
           else
@@ -103,8 +104,15 @@ jobs:
           if [ "${{ env.API_BRANCH }}" = "staging" ]; then
             IMAGE="--scalr-server-image-tag staging"
           else
-            IMAGE=""
+              API_BRANCH=${{ env.API_BRANCH }}
+              NORMALIZED_BRANCH=$(echo $API_BRANCH | tr / - | tr '[:upper:]' '[:lower:]')
+              if [ ! -z "$API_BRANCH" ] && docker manifest inspect eu.gcr.io/development-156220/fatmouse/scalr-server-te:${NORMALIZED_BRANCH} ; then 
+                  IMAGE="--scalr-server-image-tag ${NORMALIZED_BRANCH}"
+              else
+                  IMAGE=""
+              fi
           fi
+          echo "::endgroup::"
 
           docker run --rm \
           -e GITHUB_WORKSPACE=true \

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
@@ -83,6 +83,7 @@ jobs:
         id: create
         shell: bash
         run: |
+          echo "::group::Analyze branches"
           if [ ${{ env.API_BRANCH }} = "master" ]; then
             FATMOUSE_BRANCH=""
           else
@@ -98,8 +99,15 @@ jobs:
           if [ ${{ env.API_BRANCH }} = "staging" ]; then
             IMAGE="--scalr-server-image-tag staging"
           else
-            IMAGE=""
+              API_BRANCH=${{ env.API_BRANCH }}
+              NORMALIZED_BRANCH=$(echo $API_BRANCH | tr / - | tr '[:upper:]' '[:lower:]')
+              if docker manifest inspect eu.gcr.io/development-156220/fatmouse/scalr-server-te:${NORMALIZED_BRANCH} ; then
+                  IMAGE="--scalr-server-image-tag ${NORMALIZED_BRANCH}"
+              else
+                  IMAGE=""
+              fi
           fi
+          echo "::endgroup::"
 
           docker run --rm \
           -e GITHUB_WORKSPACE=true \