X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-push-upstream.yaml;h=65d2d6d859949bbcf7f8e87966bb000b3f1d6bce;hb=1619b256147a9672b3b661c1056be4bfe23ae770;hp=71069785360ea44d0da78f395ac5c3c80f3f18e3;hpb=28e1041f3891e5369fd8a6ba3434982c0404efcb;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 71069785..65d2d6d8 100644
--- a/jjb/onap/global-templates-onap-push-upstream.yaml
+++ b/jjb/onap/global-templates-onap-push-upstream.yaml
@@ -1,7 +1,7 @@
 - job-template:
-    name: 'onap-{project-name}-{stream}-push-upstream'
+    name: 'onap-{project-name}-push-upstream'
 
-    node: onap-ubuntu1604
+    node: infra-ubuntu1804
 
     disabled: false
 
@@ -11,15 +11,16 @@
       - 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
@@ -27,17 +28,16 @@
     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'
 
     builders:
       - shell:
           !include-raw-escape: ./push-upstream-jobs.sh
-
-    publishers:
-      - notify-slack:
-          slack-channel: '#infra'