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

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 0abd0cc..a084946 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -57,10 +57,6 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -109,12 +105,11 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
-            build-timeout: 1400
+            build-timeout: 1440
+##change build timeout behaviour to no-activity, 30 minutes
+        - build-no-activity-timeout:
+            build-timeout: 30
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -294,10 +289,6 @@
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '480'
 
@@ -352,10 +343,6 @@
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: 480
 
@@ -403,12 +390,11 @@
             branch: '{branch}'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '1440'
+##change build timeout behaviour to no-activity, 30 minutes
+        - build-no-activity-timeout:
+            build-timeout: '1440'
 
     triggers:
         - timed: '0 20 * * *'