From d25908c3ae07e994ef6630b776a69abfda951b0c Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 28 Mar 2018 12:06:39 -0700
Subject: [PATCH] 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>
---
 jjb/global-defaults.yaml       | 1 +
 jjb/global-macros.yaml         | 8 ++++++++
 jjb/global-templates-java.yaml | 4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

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
@@ -122,6 +122,14 @@
           default: '$JOB_NAME-$BUILD_NUMBER'
           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:
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'
-- 
2.16.6