From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 23 Feb 2017 15:36:28 +0000 (-0500)
Subject: clean up and use new script for merge
X-Git-Tag: 1.0.0-Amsterdam~633
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=02318fd5ac08111d489b8a438eb00dcdf530120b;p=ci-management.git

clean up and use new script for merge

Change-Id: I3c3864480010ee97197fe7649cec620df891d220
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/jjb/policy/include-raw-docker-merge.sh b/jjb/policy/include-raw-docker-merge.sh
new file mode 100644
index 000000000..998a93d26
--- /dev/null
+++ b/jjb/policy/include-raw-docker-merge.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO VERIFY DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 *.*
+
+./docker_merge.sh
\ No newline at end of file
diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker-release.sh
similarity index 100%
rename from jjb/policy/include-raw-docker.sh
rename to jjb/policy/include-raw-docker-release.sh
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 4489304ef..b16b0d03b 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -3,18 +3,19 @@
     name: policy-docker
     project-name: 'policy-docker-policy'
     jobs:
-      - '{project-name}-{stream}-verify-script':
+      - '{project-name}-{stream}-verify-scm-mvn-script':
+           mvn-goals: 'clean install prepare-package'
            script:
             !include-raw-escape: 'include-raw-docker-verify.sh'
       - '{project-name}-{stream}-merge-scm-mvn-script':
-           mvn-goals: '--version'
+           mvn-goals: 'clean install prepare-package'
            script:
-            !include-raw-escape: 'include-raw-docker-verify.sh'
+            !include-raw-escape: 'include-raw-docker-merge.sh'
       - '{project-name}-{stream}-docker-java-shell-daily':
           docker-pom: 'pom.xml'
-          mvn-goals: 'prepare-package'
+          mvn-goals: 'clean install prepare-package'
           script:
-            !include-raw-escape: 'include-raw-docker.sh'
+            !include-raw-escape: 'include-raw-docker-release.sh'
 
     project: 'policy/docker'
     stream: