Switch rest rebase/upstream jobs to Ubuntu 20.04 slave

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

diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml
index 322efa43a75e22da146ae75d89a8550ea299c21d..24dd1d9c98d5a18f7b361dec6fc5ca192ed053fb 100644 (file)
--- a/jjb/global/global-templates-push-upstream.yaml
+++ b/jjb/global/global-templates-push-upstream.yaml
@@ -1,11 +1,14 @@
 - job-template:
     name: '{project-name}-{stream}-push-upstream'
 
-    node: onap-ubuntu1604
+    node: onap-ubuntu2004
 
     disabled: false
 
-    concurrent: true
+    concurrent: false
+
+    properties:
+      - logrotate
 
     parameters:
       - project-parameters:
@@ -18,6 +21,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-push-upstream:
@@ -28,11 +33,11 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'infra-upstream-gerrit-ssh-passphrase'
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:
           !include-raw-escape: ./push-upstream-jobs.sh
-
-    publishers:
-      - notify-slack:
-          slack-channel: '#infra'