X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=d9143a707c29fc7390fa7a3780ba4e248dd9acfc;hb=79812780f7626b48cede6c28eb09ae34fe77097d;hp=c11280a1bdf0bdfe0e4a6b9ada52059fe4281dd3;hpb=5a14e5e16bd496387a4bd379ef008b8ad9205c83;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index c11280a1..d9143a70 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,12 +1,10 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
+    disabled_job_var: false
+    jdk-version: jdk8
 
-    node: onap-ubuntu1604
-
-    disabled: false
-
+    disabled: '{obj:disabled_job_var}'
     concurrent: true
-
     properties:
       - logrotate
 
@@ -15,13 +13,17 @@
           project: '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/java-1.8.0-openjdk-amd64
+          default: /usr/lib/jvm/openjdk-amd64
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.3.9
+          default: 3.5.4
           description: Maven version
       - string:
           name: MVN_URL
@@ -31,10 +33,6 @@
           name: MVN
           default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
           description: Path to mvn executable
-      - string:
-          name: NODE
-          default: '${node}'
-          description: node to do build on
 
     scm:
       - git-scm-gerrit: