summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-09-14 03:11:01 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-09-14 03:11:01 -0700
commit17d0a6ee55410a57c84f304f325db135ee1c0825 (patch)
treea8586307fa4c797f2df577ce0ccef9f519aa87c3
parent78e6f081f7c2d4bd7c333bdef5c7d7a09cdfe088 (diff)
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>
-rw-r--r--jjb/global-templates-java.yaml3
-rw-r--r--jjb/policy/policy-distribution.yaml2
2 files changed, 3 insertions, 2 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 25df505eb..ea8f00856 100644
--- 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 b8928f910..ae8cbf858 100644
--- 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'