From: Jose Lausuch <jalausuch@suse.com>
Date: Tue, 17 Oct 2017 15:13:16 +0000 (+0200)
Subject: Update release tags for Docker builds
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3e671c34f7b2c2b55439d6f83b201f4a4249ee48;hp=b040e3b644262b544d24a74f5787f6cb4e0476c8;p=releng.git

Update release tags for Docker builds

Change-Id: I3c4d71239dfe66773931f5f5b9349faab443aa2d
Signed-off-by: Jose Lausuch <jalausuch@suse.com>
---

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 298d2af51..402099a91 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -78,8 +78,14 @@ BUILD_BRANCH=$BRANCH
 if [[ "$BRANCH" == "master" ]]; then
     DOCKER_TAG="latest"
 elif [[ -n "${RELEASE_VERSION-}" ]]; then
-    DOCKER_TAG=${BRANCH##*/}.${RELEASE_VERSION}
-    # e.g. danube.1.0, danube.2.0, danube.3.0
+    DOCKER_TAG=${RELEASE_VERSION}
+    if git checkout ${RELEASE_VERSION}; then
+        echo "Successfully checked out the git tag ${RELEASE_VERSION}"
+    else
+        echo "The tag ${RELEASE_VERSION} doesn't exist in the repository. Existing tags are:"
+        git tag
+        exit 1
+    fi
 else
     DOCKER_TAG="stable"
 fi
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index f0020aea3..862e77ac8 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -211,7 +211,7 @@
       - string:
           name: RELEASE_VERSION
           default: ""
-          description: "Release version, e.g. 1.0, 2.0, 3.0"
+          description: "Docker tag to be built, e.g. 5.0.0, opnfv-5.0.0, 5.0.RC1"
       - string:
           name: DOCKERFILE
           default: "{dockerfile}"