diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2016-10-20 11:15:23 -0500 |
|---|---|---|
| committer | Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2016-10-20 11:30:42 -0500 |
| commit | 262faa4ac57acfe00b5184e79a1534a4b356fa3f (patch) | |
| tree | d35d50733d87834a7c24f0be9f86284e0cdc7581 /jjb | |
| parent | 7ed988259acc8820b8aafdf96c7d0a2f28e6d33c (diff) | |
Adding new wrapper to allow no-activity timeouts
Adding fdio-infra-wrappers-non-activity-timeout wrapper to allow
additional configuration timeout options. Configured CSIT timeouts
using the new wrapper.
Change-Id: I40b3288b788f1acc2c5682adb0b544af85d75335
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit.yaml | 16 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 17 |
2 files changed, 17 insertions, 16 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index a0849463a..e3046a610 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -57,7 +57,7 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: + - fdio-infra-wrappers: build-timeout: '{build-timeout}' triggers: @@ -105,11 +105,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: 1440 -##change build timeout behaviour to no-activity, 30 minutes - - build-no-activity-timeout: - build-timeout: 30 + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -390,11 +387,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: '1440' -##change build timeout behaviour to no-activity, 30 minutes - - build-no-activity-timeout: - build-timeout: '1440' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '1440' triggers: - timed: '0 20 * * *' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index caeb86c06..0abe9d2a0 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -103,12 +103,19 @@ fail: true - wrapper: - name: build-no-activity-timeout + # This wrapper is used for all jobs that require no-activity timeouts + name: fdio-infra-wrappers-non-activity-timeout wrappers: - - timeout: - type: no-activity - timeout: '{build-timeout}' - fail: true + - timeout: + type: no-activity + timeout: '{build-timeout}' + fail: true + - timestamps + - ssh-agent-credentials: + users: + - 'jenkins-gerrit-credentials' + - jclouds: + single-use: True - wrapper: # This wrapper is required for all jobs as it configures the wrappers |