From: Lusheng Ji <lji@research.att.com>
Date: Tue, 3 Apr 2018 02:36:03 +0000 (-0400)
Subject: Fix docker tag based on CIMAN-132
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=de4f9934595ff87da34d279bee77b2e50ac0acd8;p=dcaegen2%2Fplatform%2Fcdapbroker.git

Fix docker tag based on CIMAN-132

Issue-ID: DCAEGEN2-206
Change-Id: I81973cf4c30e737a7246ccefc5189e40116e5424
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 9e687c9..391ac0a 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -132,7 +132,7 @@ build_and_push_docker()
   VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}"
   VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.')
 
-  LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"
+  LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z
   BUILD_PATH="${WORKSPACE}"
   # build a docker image
   docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
@@ -175,7 +175,7 @@ build_and_push_docker()
     fi
 
     OLDTAG="${LFQI}"
-    PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION2}-${TIMESTAMP} ${REPO}/${IMAGENAME}:${VERSION2} ${REPO}/${IMAGENAME}:${VERSION2}-latest"
+    PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION}-SNAPSHOT-${TIMESTAMP}Z ${REPO}/${IMAGENAME}:${VERSION} ${REPO}/${IMAGENAME}:latest"
     for NEWTAG in ${PUSHTAGS}
     do
       echo "tagging ${OLDTAG} to ${NEWTAG}"