X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Facumos%2Fglobal-templates-acumos-java.yaml;h=0ea0ee6ca245dafa1b6a7f6008b2d9e83b62a185;hb=3e77f6448a0bd99bd43668d52485110591338cae;hp=707f3983632ea3b88cceb99577953ab77d73bdda;hpb=7e507875f63896df2bfd2e3efe33da2a9521f6ad;p=infra%2Fcicd.git

diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 707f3983..0ea0ee6c 100644
--- 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,7 +33,7 @@
     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
@@ -43,7 +41,7 @@
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'acumos/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers: