Merge changes from topic "eiffel-jjb"

[infra/cicd.git] / jjb / onap / global-templates-onap-java.yaml

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index f2fab414cc403b59ce57b03682d33898d0b042a1..5f038aa3d0ccabb8b567105922176c1f74c19e6d 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -6,6 +6,9 @@
     disabled: '{obj:disabled_job_var}'
     concurrent: true
     mvn_settings_xml_version:
+    mvn_params:
+    mvn_version: 3.5.4
+    subdirectory:
     properties:
       - logrotate
 
@@ -20,7 +23,7 @@
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.5.4
+          default: '{mvn_version}'
           description: Maven version
       - string:
           name: MVN_URL
@@ -34,7 +37,14 @@
           name: MVN_SETTINGS_XML_VERSION
           default: '{mvn_settings_xml_version}'
           description: Commit ID of ONAP Oparent repository (https://git.onap.org/oparent/) to pull. Used for Maven settings file. Can be left blank to pull the latest version.
-
+      - string:
+          name: MVN_PARAMS
+          default: '{mvn_params}'
+          description: Maven build parameters
+      - string:
+          name: SUBDIRECTORY
+          default: '{subdirectory}'
+          description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh