No-activity timeout for csit-perf jobs

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index de087dc..4890626 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.
@@ -168,11 +176,19 @@
                   branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
 
 # Publishers
 - publisher: