Create new timeout wrapper for performence jobs

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

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 6aebfa0..7f86c38 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -135,6 +135,14 @@
             timeout: 360
             fail: true
 
+- wrapper:
+    name: build-perf-timeout
+    wrappers:
+        - timeout:
+            type: no-activity
+            timeout: 2880
+            fail: true
+
 - wrapper:
     # This wrapper is used for all jobs that require no-activity timeouts
     name: fdio-infra-wrappers-non-activity-timeout
@@ -171,6 +179,23 @@
       - openstack:
           single-use: True
 
+- wrapper:
+    # This wrapper is used for all performence jobs that require timeouts
+    name: fdio-infra-wrappers-build-perf-timeout
+    wrappers:
+      - timeout:
+          type: no-activity
+          timeout: '{build-perf-timeout}'
+          fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+            - 'jenkins-gerrit-credentials'
+      - jclouds:
+          single-use: True
+      - openstack:
+          single-use: True
+
 ###### TRIGGERS
 - trigger:
     name: gerrit-trigger-patch-submitted