From: Instrumental <jonathan.gathman@att.com>
Date: Fri, 3 May 2019 14:57:40 +0000 (-0500)
Subject: Adjust STAGING tag
X-Git-Tag: delete~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=6c74e83e3a47a1e5b218253a1dba8bb89af5a002

Adjust STAGING tag

Issue-ID: AAF-823
Change-Id: I9738105929c5b12ddf5cd11664ec701848593765
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---

diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index e6230028..380f6aa5 100644
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -31,8 +31,8 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
         $DOCKER tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-latest
         $DOCKER tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
-        $DOCKER tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-STAGING-latest
+        $DOCKER tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION%-SNAPSHOT}-STAGING-latest
         $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-latest
 	$DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
-	$DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}-STAGING-latest
+	$DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION%-SNAPSHOT}-STAGING-latest
 done