Merge "Add job to cleanup cicd stacks and keypairs"

[infra/cicd.git] / jjb / onap / global-templates-local-onap-java.yaml

diff --git a/jjb/onap/global-templates-local-onap-java.yaml b/jjb/onap/global-templates-local-onap-java.yaml
index 3186731c821d38c6cbda0d11f322ce47bd7d2c63..891706871f023608441dd6637e062e7b22d085bb 100644 (file)
--- a/jjb/onap/global-templates-local-onap-java.yaml
+++ b/jjb/onap/global-templates-local-onap-java.yaml
@@ -4,7 +4,7 @@
 - job-template:
     name: 'local-onap-{project-name}-{stream}-verify-java'
     disabled_job_var: false
-    jdk-version: jdk8
+    node: onap-ubuntu1804
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
@@ -16,13 +16,9 @@
           project: 'local/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/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
@@ -57,4 +53,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh