Merge "Do not log ssh public key to console"

[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 0b522b58201e285dcb219be052ae6a4265b07729..39bcac411a835c6f15e6a9773697730409ecdf8d 100644 (file)
--- 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,14 +8,20 @@
     properties:
       - logrotate
 
+    jdk-version: jdk8
+
     parameters:
       - 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