X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=f2fab414cc403b59ce57b03682d33898d0b042a1;hb=fe25077dc847f36795636dd7556e8614cc34b203;hp=37f9df1ffe5e139638041626b54381d8ef3d75e4;hpb=c772016bc896c8d3fa8a230d774db30add15268f;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 37f9df1f..f2fab414 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,31 +1,26 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
+    disabled_job_var: false
+    node: onap-ubuntu1804
 
-    node: onap-ubuntu1604
-
-    disabled: false
-
+    disabled: '{obj:disabled_job_var}'
     concurrent: true
-
+    mvn_settings_xml_version:
     properties:
       - logrotate
 
     parameters:
-      - string:
-          name: NODE_LABELS
-          default: '{node}'
-          description: node to do build on
       - project-parameters:
           project: 'onap/{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.3.9
+          default: 3.5.4
           description: Maven version
       - string:
           name: MVN_URL
@@ -35,7 +30,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 +55,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh