Merge "No-activity timeout for csit-perf jobs"

[ci-management.git] / jjb / ci-management / ci-management-jobs.yaml

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 559a739..226d77f 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -31,9 +31,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -72,9 +71,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -82,8 +80,10 @@
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-jjb-update.sh
+        - shell: |
+            pip freeze
+            jenkins-jobs --version
+            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
 - job-template:
     name: ci-management-verify-zuul
@@ -105,9 +105,8 @@
             commit: '$ZUUL_COMMIT'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -132,9 +131,8 @@
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -162,9 +160,8 @@
             commit: '$ZUUL_COMMIT'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -189,9 +186,8 @@
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell: