Merge "Modify airship metal3-io credentials for dev env PR checks"

[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 dff9cf13130bfbdf08ba0efa2cfce7c0b914820f..39bcac411a835c6f15e6a9773697730409ecdf8d 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,10 +1,6 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
 
-    node: onap-ubuntu1604
-
-    node_labels: onap-ubuntu1604
-
     disabled: false
 
     concurrent: true
@@ -12,18 +8,20 @@
     properties:
       - logrotate
 
+    jdk-version: jdk8
+
     parameters:
-      - string:
-          name: NODE_LABELS
-          default: '{node_labels}'
-          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
@@ -38,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