summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-defaults.yaml2
-rw-r--r--jjb/global-macros.yaml13
2 files changed, 15 insertions, 0 deletions
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index bf14ab53d..192163d76 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -7,6 +7,8 @@
build-num-to-keep: 40
build-artifact-days-to-keep: -1
build-artifact-num-to-keep: 5
+ # Timeout in minutes
+ build-timeout: 360
ssh-credentials: 'jenkins-gerrit-credentials'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d032bcc96..ec44e9a3e 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -102,6 +102,19 @@
timeout: 360
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
+ - jclouds:
+ single-use: True
+
###### TRIGGERS
- trigger:
name: gerrit-trigger-patch-submitted