ACUMOS: Improve jenkins jobs for Acumos projects

[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 707f3983632ea3b88cceb99577953ab77d73bdda..2ea9d53c379ff9f6f67cb3102ae702cb1bc7e3d9 100644 (file)
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-verify-java'
+    name: 'acumos-{project-name}-verify-java'
 
     node: acumos-ubuntu1604
 
@@ -11,10 +11,11 @@
       - 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
@@ -35,7 +36,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 +44,7 @@
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'acumos/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers: