X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=39bcac411a835c6f15e6a9773697730409ecdf8d;hb=refs%2Fchanges%2F58%2F2258%2F3;hp=37f9df1ffe5e139638041626b54381d8ef3d75e4;hpb=aa1084a78e0be27fc985fd0044283cec437374b1;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 37f9df1f..39bcac41 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,8 +1,6 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
 
-    node: onap-ubuntu1604
-
     disabled: false
 
     concurrent: true
@@ -10,18 +8,20 @@
     properties:
       - logrotate
 
+    jdk-version: jdk8
+
     parameters:
-      - string:
-          name: NODE_LABELS
-          default: '{node}'
-          description: node to do build on
       - project-parameters:
           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
@@ -36,7 +36,6 @@
           default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
           description: Path to mvn executable
 
-
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh