Merge branch 'DEVELOP' of...

Merge branch 'DEVELOP' of gitlab.eclipse.org:eclipse/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP

.gitlab-ci.yml

@@ -53,12 +53,13 @@ stages:
     - |
       if [[ "$CI_COMMIT_TAG" == "" ]]; then
         tag="sha-${CI_COMMIT_SHORT_SHA}"
+        CI_SOURCE_BRANCH=$(echo $CI_COMMIT_BRANCH | tr '[:upper:]' '[:lower:]')
       else
-        tag="$CI_COMMIT_TAG"
+        tag="$CI_COMMIT_TAG";
+        # Get (source) branch when tagging
+        CI_SOURCE_BRANCH=$(git for-each-ref | grep $CI_COMMIT_SHA | grep origin | sed "s/.*\///" | tr '[:upper:]' '[:lower:]')
       fi
     - echo current tag ${tag}
-    # Get (source) branch when tagging
-    - CI_SOURCE_BRANCH=$(git for-each-ref | grep $CI_COMMIT_SHA | grep origin | sed "s/.*\///" | tr '[:upper:]' '[:lower:]')
     - echo CI_SOURCE_BRANCH $CI_SOURCE_BRANCH
     - REGISTRY_IMAGE_BASE="$CI_REGISTRY_IMAGE/$CI_SOURCE_BRANCH/$IMG_NAME"
     - FINAL_REGISTRY_IMAGE="$CI_REGISTRY_IMAGE/$CI_SOURCE_BRANCH/$IMG_NAME:${tag}"