ACUMOS: Java 11 introduction

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

diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 06408ed2556fa3cd816b305ee6d3566b74db95d0..0ea0ee6ca245dafa1b6a7f6008b2d9e83b62a185 100644 (file)
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -1,23 +1,21 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-verify-java'
-
-    node: acumos-ubuntu1604
-
+    name: 'acumos-{project-name}-verify-java'
+    node: acumos-ubuntu1804
     disabled: false
-
     concurrent: true
 
     properties:
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'acumos/{project}'
-          branch: '{branch}'
       - nordix-gerrit-parameters
+      - string:
+          name: PROJECT
+          default: 'acumos/{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
@@ -35,19 +33,16 @@
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
+          branch: $GERRIT_BRANCH
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'acumos/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
 
     wrappers:
       - build-timeout: