Add a new job for holmes/common

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

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index 7b42fcd..57a0264 100644 (file)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
 SEARCH="aai-service";
 DATETIME_STAMP=$(date +%Y%m%dT%H%M%S);
 VERSION_FILE="version.properties"
@@ -15,6 +15,7 @@ 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};
@@ -26,7 +27,14 @@ if [[ $PROJECT =~ $SEARCH ]] ; then
     docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
     docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
 
-    docker push $REPO_PATH:latest;
+    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:$STAGING_TAG;
     docker push $REPO_PATH:$SNAPSHOT_TAG;
 else
@@ -38,7 +46,14 @@ else
     docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG;
     docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG;
 
-    docker push $REPO_PATH:latest;
+    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;
 fi