ONAP: Handle MVN settings.xml file as part of project build

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

diff --git a/jjb/onap/global-templates-local-onap-java.yaml b/jjb/onap/global-templates-local-onap-java.yaml
index 3186731c821d38c6cbda0d11f322ce47bd7d2c63..0cc83b96f123396ac94c1d66caf04879181a9caf 100644 (file)
--- a/jjb/onap/global-templates-local-onap-java.yaml
+++ b/jjb/onap/global-templates-local-onap-java.yaml
@@ -4,10 +4,11 @@
 - job-template:
     name: 'local-onap-{project-name}-{stream}-verify-java'
     disabled_job_var: false
-    jdk-version: jdk8
+    node: onap-ubuntu1804
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
+    mvn_settings_xml_version:
     properties:
       - logrotate
 
@@ -16,13 +17,9 @@
           project: 'local/onap/{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
-      - label:
-          name: SLAVE_LABEL
-          default: 'onap-build-ubuntu1604-{jdk-version}'
-          description: 'Slave label to schedule this job on'
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
@@ -36,6 +33,10 @@
           name: MVN
           default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
           description: Path to mvn executable
+      - string:
+          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.
 
     scm:
       - git-scm-gerrit:
@@ -57,4 +58,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh