X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Finclude-docker-push.sh;h=cd88f9d17320aa42e40f94a99821e6c7ad39223b;hb=refs%2Fheads%2Fmaster;hp=015ac745338e6fa39012b595a57baf1ca8be3c31;hpb=46366e33020e152dba0d5a2b8d3bc9542d44f72a;p=ci-management.git

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
old mode 100644
new mode 100755
index 015ac7453..cd88f9d17
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -15,45 +15,39 @@ else
     VERSION=1.1.0;
 fi
 
+RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$";
 
-SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP};
-STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP};
+SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP}Z;
+STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP}Z;
 
-if [[ $PROJECT =~ $SEARCH ]] ; then
 
-    REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai;
+# Set REPO_PATH variable
 
-    docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
-    docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
+if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
+    REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME};
 
-    if [ "$VERSION" == "1.0.0" ]; then
-        docker tag $REPO_PATH:latest $REPO_PATH:1.0-STAGING-latest;
-        docker push $REPO_PATH:1.0-STAGING-latest;
-    else if [ "$VERSION" == "1.1.0" ]; then
-        docker tag $REPO_PATH:latest $REPO_PATH:1.1-STAGING-latest;
-        docker push $REPO_PATH:1.0-STAGING-latest;
-    else
-        docker push $REPO_PATH:latest;
-    fi
-
-    docker push $REPO_PATH:$STAGING_TAG;
-    docker push $REPO_PATH:$SNAPSHOT_TAG;
+    # tag image with nexus3 proxy prefix
+    docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
+elif [[ $PROJECT =~ $SEARCH ]] ; then
+    REPO_PATH=$DOCKER_REPOSITORY/onap/ajsc-aai;
 else
     # Cut the prefix aai/ in example aai/model-loader
     DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
 
-    REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME};
+    REPO_PATH=$DOCKER_REPOSITORY/onap/${DOCKER_REPO_NAME};
+fi
 
-    docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
-    docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
 
-    if [ "$VERSION" == "1.0.0" ]; then
-        docker tag $REPO_PATH:latest $REPO_PATH:1.0-STAGING-latest;
-        docker push $REPO_PATH:1.0-STAGING-latest;
-    else
-        docker push $REPO_PATH:latest;
-    fi
+docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
+docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
 
-    docker push $REPO_PATH:$SNAPSHOT_TAG;
-    docker push $REPO_PATH:$STAGING_TAG;
+if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then
+    STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2);
+    docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
+    docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest;
+else
+    docker push $REPO_PATH:latest;
 fi
+
+docker push $REPO_PATH:$SNAPSHOT_TAG;
+docker push $REPO_PATH:$STAGING_TAG;