OPENDEV: Update jobs to track all OpenDev branches

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

diff --git a/jjb/opendev/global-templates-opendev-push-upstream.yaml b/jjb/opendev/global-templates-opendev-push-upstream.yaml
index 07200020448fbc6dca0785b93907c4c72bdd8442..5b8bfb6127095bf4b34e372dd559d49d33e3ff53 100644 (file)
--- a/jjb/opendev/global-templates-opendev-push-upstream.yaml
+++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'opendev-{project-name}-{stream}-push-upstream'
+    name: 'opendev-{project-name}-push-upstream'
 
     node: infra-build01-ubuntu1804
 
@@ -11,15 +11,16 @@
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'opendev/{project}'
-          branch: '{branch}'
+      - string:
+          name: PROJECT
+          default: 'opendev/{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-patchset-created-or-push-upstream:
           project: 'opendev/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers: