Change the docker push to be generic

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

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 3560ec4..0def78b 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -708,7 +708,7 @@
             - docker.pull.registry=nexus3.openecomp.org:10001
             - docker.push.registry=nexus3.openecomp.org:10003
 
-      - shell: !include-raw: 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 ec78d9a..929b6a2 100644 (file)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -6,5 +6,7 @@ SEARCH="aai-service";
 if [[ $PROJECT =~ $SEARCH ]] ; then
     docker push $DOCKER_REPOSITORY/openecomp/ajsc-aai:latest;
 else
-    docker push $DOCKER_REPOSITORY/openecomp/model-loader:latest;
+    # Cut the prefix aai/ in example aai/model-loader
+    DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
+    docker push $DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME}:latest;
 fi