Update push script for the proper image tags

Change-Id: Iaeb2d3bb35622474fa671f4f65f38fd3795e3374
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index 3a3c842..6c26ce3 100644 (file)
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -9,7 +9,7 @@
       - '{project-name}-docker-image-blessing'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'ajsc-aai/pom.xml'
-          mvn-goals: 'docker:build docker:push'
+          mvn-goals: 'docker:build'
 
     project: 'aai/aai-service'
     stream:

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 7bdf1f9..ae2c8cd 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -9,7 +9,7 @@
       - '{project-name}-docker-image-blessing'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
-          mvn-goals: 'docker:build docker:push'
+          mvn-goals: 'docker:build'
     project: 'aai/model-loader'
     stream:
       - 'master':

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 40c189d..ffab7c3 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -862,7 +862,7 @@
             - docker.pull.registry=nexus3.openecomp.org:10001
             - docker.push.registry=nexus3.openecomp.org:10003
 
-    #      - shell: !include-raw-escape: include-docker-push.sh
+      - shell: !include-raw-escape: include-docker-push.sh
 
 - job-template:
     # Job template for Java daily release jobs

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index 7b42fcd..0acc221 100644 (file)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -26,7 +26,13 @@ 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" == "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 push $REPO_PATH:$STAGING_TAG;
     docker push $REPO_PATH:$SNAPSHOT_TAG;
 else
@@ -38,7 +44,13 @@ 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" == "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 push $REPO_PATH:$SNAPSHOT_TAG;
     docker push $REPO_PATH:$STAGING_TAG;
 fi