X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fopendev%2Fglobal-templates-opendev-push-upstream.yaml;h=cabc612c584592b415310537c4090da4da5cc0a4;hb=e2a74cef07236f07a0dbc0507b824a0faf344d7b;hp=385fdd4d02abe76a5917b971096c2955be23b01a;hpb=d377a80f70549e3626f90dc2b055c725a1fb3b30;p=infra%2Fcicd.git

diff --git a/jjb/opendev/global-templates-opendev-push-upstream.yaml b/jjb/opendev/global-templates-opendev-push-upstream.yaml
index 385fdd4d..cabc612c 100644
--- a/jjb/opendev/global-templates-opendev-push-upstream.yaml
+++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml
@@ -1,41 +1,43 @@
 - job-template:
-    name: 'opendev-{project-name}-{stream}-push-upstream'
+    name: 'opendev-{project-name}-push-upstream'
 
-    node: infra-build01-ubuntu1804
+    node: infra-ubuntu1804
 
     disabled: false
 
-    concurrent: true
+    concurrent: false
 
     properties:
       - 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
 
     triggers:
-      - nordix-gerrit-push-upstream:
+      - nordix-gerrit-patchset-created-or-push-upstream:
           project: 'opendev/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'infra-upstream-gerrit-ssh-passphrase'
 
     builders:
       - shell:
           !include-raw-escape: ./push-upstream-jobs.sh
-
-    publishers:
-      - notify-slack:
-          slack-channel: '#infra'