INFRA: Switch to tox for JJB verify and merge jobs

[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 cde2a836058691698d2132fd02e4df71c999b1f1..0cea40999d70ceacfe6d23d8cf5c894e25fce5b9 100644 (file)
--- a/jjb/global/global-templates-push-upstream.yaml
+++ b/jjb/global/global-templates-push-upstream.yaml
@@ -5,7 +5,10 @@
 
     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:
@@ -25,6 +30,13 @@
           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