Modify aaf docker jenkins template

Modify jenkins template  to call maven settings to run
shell script.

Issue-ID: AAF-208
Change-Id: I9b464febc713acc8f8570d8e516b8a732f88ad68
Signed-off-by: Sai Gandham <sg481n@att.com>

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 91b11e6..76ff4b6 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -7,7 +7,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-golang-shell-daily':
+      - '{project-name}-{stream}-docker-java-shell-daily':
+          mvn-goals: 'clean install'
+          settings: '{mvn-settings}'
           script:
             !include-raw-escape: 'build-aaf-docker-image.sh'
     project: 'aaf/authz'

diff --git a/jjb/aaf/build-aaf-docker-image.sh b/jjb/aaf/build-aaf-docker-image.sh
index f5969a4..17168ae 100644 (file)
--- a/jjb/aaf/build-aaf-docker-image.sh
+++ b/jjb/aaf/build-aaf-docker-image.sh
@@ -1,8 +1,6 @@
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 ls -ltr
-mvn clean install
-ls -ltr
 cd auth/docker/
 ls -ltr
 chmod 755 *