Merge "Revert "GEODE: Update branch to: release-nordix/1.12.0""

[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 083b01112c06967e3fbe8725b4daf62d0ec8b6d4..d9143a707c29fc7390fa7a3780ba4e248dd9acfc 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,31 +1,29 @@
 - 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
 
     parameters:
-      - string:
-          name: NODE
-          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
-          default: 3.3.9
+          default: 3.5.4
           description: Maven version
       - string:
           name: MVN_URL
@@ -36,7 +34,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