summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-05-07 11:13:19 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-05-07 11:15:09 -0700
commitf8f030a48a3d14836352869a1cd29b12f716738b (patch)
treed814c9900e82388d292614e016b8057fe01523e1
parent7087ff627c74cea2ccf09ee0d9dc2b3447688069 (diff)
Add mvn-params for docker jobs
Add mvn-params optional parameter for docker daily job templates. Change-Id: I13f34380539e6b7180ebbc93d649115afbe2aca2 Issue-ID: CIMAN-158 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/global-macros.yaml2
-rw-r--r--jjb/global-templates-java.yaml12
2 files changed, 13 insertions, 1 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 49446efbd..2182bf2b2 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -51,7 +51,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy -B -P {mvn-profile}'
+ goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
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 b1750d603..768392414 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1217,6 +1217,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1250,6 +1252,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
@@ -1285,6 +1288,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
refspec: ''
@@ -1328,6 +1333,7 @@
properties: '{maven-properties}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
maven-version: '{maven-version}'
@@ -1597,6 +1603,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1643,6 +1651,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs:
@@ -1678,6 +1687,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -1726,6 +1737,7 @@
pom: '{docker-pom}'
# use default as mvn-profile if profile is not needed
mvn-profile: '{mvn-profile}'
+ mvn-params: '{mvn-params}'
publishers:
- infra-shiplogs: