summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-28 12:06:39 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-28 12:06:39 -0700
commitd25908c3ae07e994ef6630b776a69abfda951b0c (patch)
treea2e34c1c2c19e9f099d3545f4781bfc0a7b2a79b
parentf656896f7fcd5c7b96f533402695bd888cfea3ef (diff)
Add mvn-params to verify-java
'{project-name}-{stream}-verify-java' needs an option to provide mvn-parameters to the builder step. Add mvn-params parameter to the job. Change-Id: Ib3ff4bfe487223270dcae508f4dbbfab880de178 Issue-ID: CIMAN-152 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/global-defaults.yaml1
-rw-r--r--jjb/global-macros.yaml8
-rw-r--r--jjb/global-templates-java.yaml4
3 files changed, 12 insertions, 1 deletions
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 51cf6c6dd..450355ff2 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -25,6 +25,7 @@
jdk: ''
# Maven
+ mvn-params: ''
onap-infra-mvn-opts: |
--show-version
--batch-mode
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 6be0e0f94..27167b67e 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -123,6 +123,14 @@
description: 'Used by Heat to generate a unique stack & vm name'
- parameter:
+ name: maven-params
+ parameters:
+ - string:
+ name: MAVEN_PARAMS
+ default: '{mvn-params}'
+ description: Maven parameters to pass to the mvn command.
+
+- parameter:
name: maven-exec
parameters:
- string:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 210ed9b82..171fdb191 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -90,6 +90,8 @@
artifacts: '{archive-artifacts}'
- maven-exec:
maven-version: '{maven-version}'
+ - maven-params:
+ mvn-params: '{mvn-params}'
scm:
- gerrit-trigger-scm:
@@ -115,7 +117,7 @@
- maven-target:
maven-version: '{maven-version}'
goals: 'clean install -B
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'