Merge "Chore: Move to ubuntu2004-docker"

[ci-management.git] / jjb / include-docker-push.sh

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index df42fa7..cd88f9d 100755 (executable)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -17,8 +17,8 @@ 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;
 
 
 # Set REPO_PATH variable
@@ -29,12 +29,12 @@ if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
     # tag image with nexus3 proxy prefix
     docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
 elif [[ $PROJECT =~ $SEARCH ]] ; then
-    REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai;
+    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