X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=caeb86c061d758e4755ae45d2d4672071905cb9f;hb=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=d032bcc96bf85e542e73e05bef17d9fc97fa0166;hpb=e4459ea2a2933e30a357974375a7cbde1573f266;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d032bcc96..caeb86c06 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -102,6 +102,31 @@
             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.
+    name: fdio-infra-wrappers
+    wrappers:
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+              - 'jenkins-gerrit-credentials'
+      - jclouds:
+          single-use: True
+
 ###### TRIGGERS
 - trigger:
     name: gerrit-trigger-patch-submitted
@@ -155,6 +180,19 @@
                   branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+            # 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:
@@ -224,4 +262,3 @@
                   variable: 'GLOBAL_SETTINGS_FILE'
                 - file-id: '{settings-file}'
                   variable: 'SETTINGS_FILE'
-