Using profile for docker image build

Change-Id: I858f4dc73a3d11932526d116e2f291fac08a684c
Signed-off-by: Anaël Closson <ac2550@intl.att.com>

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 5815ccf..b324534 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -26,7 +26,7 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: '{pom}'
-          goals: 'clean deploy -B'
+          goals: 'clean deploy -B -P ${mvn-profile}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -42,7 +42,7 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: '{pom}'
-          goals: 'clean deploy -B'
+          goals: 'clean deploy -B -P ${mvn-profile}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 32770f2..a5d4ab6 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -412,3 +412,5 @@
       - maven-docker-push-daily:
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'

diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index 060df18..2628fec 100644 (file)
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -8,7 +8,8 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: './packages/docker/pom.xml'
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
 
     project: 'mso'
     stream: