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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 7ddc898..a084946 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -106,7 +106,10 @@
 
     wrappers:
         - 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:
@@ -389,6 +392,9 @@
     wrappers:
         - 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 * * *'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index b5b0e1f..caeb86c 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -102,6 +102,14 @@
             timeout: 360
             fail: true
 
+- wrapper:
+    name: build-no-activity-timeout
+    wrappers:
+        - timeout:
+            type: no-activity
+            timeout: '{build-timeout}'
+            fail: true
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the fd.io infra.