X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Finclude-docker-push.sh;h=cd88f9d17320aa42e40f94a99821e6c7ad39223b;hb=f05189249163b371fb5acb80e1a53a117c8c636a;hp=1a89fe72c4cd6a30f23e67f5d927665ff8fcccb2;hpb=dc3f295a8efaa190e70eef8472f7f6aa012649d3;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 1a89fe72c..cd88f9d17 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -17,21 +17,24 @@ 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 if [ ! -z "$DOCKER_IMAGE_NAME" ]; then - REPO_PATH=$DOCKER_REPOSITORY/${$DOCKER_IMAGE_NAME}; + REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME}; + + # 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