Fix docker tag 07/40607/1
authorLusheng Ji <lji@research.att.com>
Tue, 3 Apr 2018 01:58:00 +0000 (21:58 -0400)
committerLusheng Ji <lji@research.att.com>
Tue, 3 Apr 2018 01:59:54 +0000 (21:59 -0400)
Follow the docker tagging required by CIMAN.

Issue-ID: DCAEGEN2-206
Change-Id: I013b2b33109e034bb329967198c8fd589c92ff92
Signed-off-by: Lusheng Ji <lji@research.att.com>
mvn-phase-lib.sh

index d3c3f25..ac53722 100755 (executable)
@@ -237,7 +237,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 a docker image
   docker build --rm -f ./Dockerfile -t "${LFQI}" ./
 
@@ -279,7 +279,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}"