diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2016-10-20 15:46:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-10-20 15:46:59 +0000 |
| commit | 7ed988259acc8820b8aafdf96c7d0a2f28e6d33c (patch) | |
| tree | 830f1aaf0cdef0fc842b69d225f0b2252b0923a3 | |
| parent | 41bad5f842df8862154be09fe69ca4f501c73224 (diff) | |
| parent | fc94a46a65330a4b683a48b56135d18459f8058c (diff) | |
Merge "No-activity timeout for csit-perf jobs"
| -rw-r--r-- | jjb/csit/csit.yaml | 8 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 7ddc89846..a0849463a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -106,7 +106,10 @@ wrappers: - fdio-infra-wrappers: - build-timeout: 1400 + build-timeout: 1440 +##change build timeout behaviour to no-activity, 30 minutes + - build-no-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -389,6 +392,9 @@ wrappers: - fdio-infra-wrappers: build-timeout: '1440' +##change build timeout behaviour to no-activity, 30 minutes + - build-no-activity-timeout: + build-timeout: '1440' triggers: - timed: '0 20 * * *' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index b5b0e1f14..caeb86c06 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -103,6 +103,14 @@ 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 |