OpenDaylight: Improve jenkins jobs for OpenDaylight projects

[infra/cicd.git] / jjb / opendaylight / global-templates-opendaylight-push-upstream.yaml

diff --git a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
index d1e6b500fba81361da6e9b99874dd3d82617411b..63743d751957df8e401248028e1983cf693f85a2 100644 (file)
--- a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
+++ b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml
@@ -1,25 +1,26 @@
 - job-template:
-    name: 'opendaylight-{project-name}-{stream}-push-upstream'
+    name: 'opendaylight-{project-name}-push-upstream'
 
-    node: infra-build01-ubuntu1804
+    node: infra-ubuntu1804
 
     disabled: false
 
-    concurrent: true
+    concurrent: false
 
     properties:
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'opendaylight/{project}'
-          branch: '{branch}'
+      - string:
+          name: PROJECT
+          default: 'opendaylight/{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - nordix-gerrit-parameters
 
     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
@@ -27,7 +28,7 @@
     triggers:
       - nordix-gerrit-push-upstream:
           project: 'opendaylight/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers: