From 5ef6bc2a411a5ef8fa8427d9b0d5aa1466dc5efd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 21 Sep 2020 11:40:14 +0100
Subject: [PATCH] Fix release tag issue

---
 .../ci/tasks/dev-releases/generate-tag-files.yml   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/deploy/ci/tasks/dev-releases/generate-tag-files.yml b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
index 18c0918107..2787beb72b 100644
--- a/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+++ b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
@@ -20,14 +20,26 @@ run:
 
       cd stratos
 
+      # RELEASE_TAG is the full tag that started the pipleine, e.g. '2.0.0-rc.1' 
       RELEASE_TAG=$(cat .git/ref)
 
-      # RELEASE_TAG is the full tag that started the pipleinee, e.g. '2.0.0-rc.1' 
       VERSION=$(cat package.json | grep version | grep -Po "([0-9\.]?)*")
       COMMIT_HASH=$(git log -1 --format="%h")
       LATEST_TAG=$VERSION-${COMMIT_HASH}
       SOURCE_CODE_REPO=$(git config --get remote.origin.url)
 
+      # Check that the RELEASE_TAG matches the version
+      if [[ "${RELEASE_TAG}" != ${VERSION}* ]]; then
+        echo ".git/ref is not the expected release tag - falling back to git describe"
+        RELEASE_TAG=$(git describe)
+        if [[ "${RELEASE_TAG}" != ${VERSION}* ]]; then
+          echo "Error: Can not get tag for this release - got ${RELEASE_TAG}"
+          exit 1
+        fi
+      fi
+
+      echo "Got Release tag ${RELEASE_TAG}"
+
       echo "Got version $VERSION from package.json."
 
       echo "Got $LATEST_TAG as the latest git tag."