Merge "eiffel: Fix image name var and set harbor credentials"

[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..cabc612c584592b415310537c4090da4da5cc0a4 100644 (file)
--- a/jjb/opendev/global-templates-opendev-push-upstream.yaml
+++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml
@@ -1,25 +1,26 @@
 - 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
@@ -27,17 +28,16 @@
     triggers:
       - 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'