diff options
| -rw-r--r-- | jjb/csit/csit.yaml | 58 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 25 |
2 files changed, 16 insertions, 67 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index d1319635a..8e150685a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -98,8 +98,6 @@ wrappers: - fdio-infra-wrappers: build-timeout: '{build-timeout}' - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 triggers: - gerrit-trigger-patch-submitted: @@ -149,8 +147,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers-build-perf-timeout: - build-perf-timeout: '{build-perf-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-manually-triggered: @@ -271,8 +269,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-manually-triggered: @@ -1259,10 +1257,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-manually-triggered: @@ -1314,10 +1310,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: 600 - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - timed: '0 4 * * 0' @@ -1363,10 +1357,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: 600 - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - timed: '0 4 * * 2,6' @@ -1477,10 +1469,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -1540,10 +1530,8 @@ choosing-strategy: 'default' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - reverse: @@ -1619,10 +1607,8 @@ choosing-strategy: 'default' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -1711,10 +1697,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - timed: 'H H(17-20) * * *' @@ -2103,10 +2087,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - timed: 'H H(17-20) * * 2,6' @@ -2507,10 +2489,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -2594,10 +2574,8 @@ branch: '{branch}' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - timed: 'H H(0-2) * * *' @@ -2684,10 +2662,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -2766,10 +2742,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-perf-timeout}' - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 360 + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-manually-triggered: diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 7f86c3831..6aebfa0d6 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -136,14 +136,6 @@ fail: true - wrapper: - name: build-perf-timeout - wrappers: - - timeout: - type: no-activity - timeout: 2880 - fail: true - -- wrapper: # This wrapper is used for all jobs that require no-activity timeouts name: fdio-infra-wrappers-non-activity-timeout wrappers: @@ -179,23 +171,6 @@ - openstack: single-use: True -- wrapper: - # This wrapper is used for all performence jobs that require timeouts - name: fdio-infra-wrappers-build-perf-timeout - wrappers: - - timeout: - type: no-activity - timeout: '{build-perf-timeout}' - fail: true - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - - jclouds: - single-use: True - - openstack: - single-use: True - ###### TRIGGERS - trigger: name: gerrit-trigger-patch-submitted |