Add mvn-params to merge-java job

Some projects like policy-distribution need to make
reference to a specific pom file profile for performing
the merge. Allowing to pass a profile name as optional
parameter "mvn-params"

Change-Id: Ic91685c0f8d571f636bbf1f4477625e1470daae3
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 25df505..ea8f008 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -561,6 +561,7 @@
     pattern: '**'
     pom:
     mvn_properties: []
+    mvn-params: ''
 
     properties:
       - infra-properties:
@@ -599,7 +600,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{obj:pom}'
-          goals: 'clean deploy -B
+          goals: 'clean deploy -B {mvn-params}
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           settings: '{mvn-settings}'
           settings-type: cfp

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index b8928f9..ae8cbf8 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-params: '-P docker'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'