Change the default timeout wrapper on csit* jobs

Change-Id: Ief2225fec766de85c49f2b5ae35de34401535edb
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 1de9794..382d1c3 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -149,10 +149,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-perf-timeout}'
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
+            build-timeout: '{build-perf-timeout}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -275,8 +273,6 @@
     wrappers:
         - fdio-infra-wrappers:
             build-timeout: '{build-perf-timeout}'
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 360
 
     triggers:
         - gerrit-trigger-manually-triggered: