X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-push-upstream.yaml;h=fce75a089fb0169765e7ef0bc55b6976ed9f2c42;hb=9e37aa61ad8a82f78cd1f7e15e62a68e593a1f5f;hp=5e44ed85817205a23560a05ca367ea4222e59322;hpb=e53f009e429bb4c792a1920f2c5ff71742f52250;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-push-upstream.yaml b/jjb/onap/global-templates-onap-push-upstream.yaml
index 5e44ed85..fce75a08 100644
--- a/jjb/onap/global-templates-onap-push-upstream.yaml
+++ b/jjb/onap/global-templates-onap-push-upstream.yaml
@@ -1,41 +1,42 @@
 - job-template:
-    name: 'onap-{project-name}-{stream}-push-upstream'
-
-    node: onap-ubuntu1604
-
+    name: 'onap-{project-name}-push-upstream'
+    node: infra-ubuntu2004
     disabled: false
-
-    concurrent: true
+    concurrent: false
 
     properties:
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: 'onap/{project}'
-          branch: '{branch}'
+      - string:
+          name: PROJECT
+          default: 'onap/{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:
           project: 'onap/{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
 
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
+      - nordix-gerrit-http-api-token
 
     builders:
       - shell:
           !include-raw-escape: ./push-upstream-jobs.sh
-
-    publishers:
-      - notify-slack:
-          slack-channel: '#infra'