Revert "Use different slaves based on JDK version projects need"

This reverts commit ddfb33b13040f56b8134765fc84acfa685646bcd.

Change-Id: Ib99864c1f17b74bfae884beed3f9898730694af1

diff --git a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
index dde658076cffc00d5b862fd08fca947867bb6462..c13e785c4f6dbcbc4aa7bc30202fb43931cbd2f3 100644 (file)
--- a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
@@ -28,10 +28,10 @@
     stream:
       - master:
           branch: '{stream}'
-          jdk-version: jdk11
       - dublin:
           branch: '{stream}'
-          jdk-version: jdk8
 
     jobs:
-      - 'onap-{project-name}-{stream}-verify-java'
+      - 'onap-{project-name}-{stream}-verify-java':
+         node: geode-ubuntu1804
+         node_labels: geode-ubuntu1804

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index dd8411615bd4f0826dbd4135c5902d8bdf4f529c..dff9cf13130bfbdf08ba0efa2cfce7c0b914820f 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,6 +1,10 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
 
+    node: onap-ubuntu1604
+
+    node_labels: onap-ubuntu1604
+
     disabled: false
 
     concurrent: true
@@ -8,20 +12,18 @@
     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/openjdk-amd64
+          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
           description: Java home
       - string:
           name: MVN_VERSION