3 files changed, 24 insertions, 5 deletions
diff --git a/jjb/policy/include-raw-docker-verify.sh b/jjb/policy/include-raw-docker-verify.sh
new file mode 100644
index 000000000..d1943ba7c
--- /dev/null
+++ b/jjb/policy/include-raw-docker-verify.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+
+DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+
+for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do
+    echo "Building $image"
+    mkdir -p target/$image
+    cp $image/* target/$image
+done
diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker.sh
index a2e55bef8..73581076e 100644
--- a/jjb/policy/include-raw-docker.sh
+++ b/jjb/policy/include-raw-docker.sh
@@ -3,16 +3,16 @@
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
 
 
-DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
-                   nexus3.openecomp.org:10002 \
-                   nexus3.openecomp.org:10003"
+DOCKER_REPOSITORY=nexus3.openecomp.org:10003
 
 for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do
+    echo "Building $image"
     mkdir -p target/$image
     cp $image/* target/$image
-    docker build --quiet --tag ${DOCKER_REPOSITORY}/policy:$image target/$image
+    docker build --quiet --tag ${DOCKER_REPOSITORY}/openecomp/policy:$image target/$image
 done
 
 for image in policy-nexus policy-db policy-drools policy-pe; do
-    docker push ${DOCKER_REPOSITORY}/policy:$image
+    echo "Pushing $image"
+    docker push ${DOCKER_REPOSITORY}/openecomp/policy:$image
 done
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 71879f16c..4489304ef 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -3,6 +3,13 @@
     name: policy-docker
     project-name: 'policy-docker-policy'
     jobs:
+      - '{project-name}-{stream}-verify-script':
+           script:
+            !include-raw-escape: 'include-raw-docker-verify.sh'
+      - '{project-name}-{stream}-merge-scm-mvn-script':
+           mvn-goals: '--version'
+           script:
+            !include-raw-escape: 'include-raw-docker-verify.sh'
       - '{project-name}-{stream}-docker-java-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'prepare-package'