diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-20 18:19:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-20 18:19:08 +0000 |
| commit | e50b758ee52f2f1b249114d0f172d00ac48c52d4 (patch) | |
| tree | 183f64566733d099e8399f0573f8bf0a7f585581 | |
| parent | 40e0f3f10f92bb3d6e85df3bf5a0dafd8543b2c7 (diff) | |
| parent | 013c18d329a8e39b6caa0d3a26404f2320bedfae (diff) | |
| download | keystone-e50b758ee52f2f1b249114d0f172d00ac48c52d4.tar.gz | |
Merge "Readjust job timeouts"
| -rw-r--r-- | .zuul.yaml | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index dcfbfb847..7ea95164b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -71,6 +71,7 @@ - job: name: keystone-tox-protection parent: openstack-tox-py37 + timeout: 3600 vars: tox_envlist: protection bindep_profile: test py37 @@ -168,17 +169,6 @@ - release-notes-jobs-python3 check: jobs: - # Override tox timeouts - - openstack-tox-py37: - timeout: 5400 - - openstack-tox-py36: - timeout: 5400 - - openstack-tox-py27: - timeout: 5400 - - openstack-tox-cover: - timeout: 5400 - - openstack-tox-lower-constraints: - timeout: 5400 - keystone-dsvm-functional: irrelevant-files: &irrelevant-files - ^.*\.rst$ @@ -222,15 +212,6 @@ - keystone-tox-protection gate: jobs: - # Override tox timeouts - - openstack-tox-py37: - timeout: 5400 - - openstack-tox-py36: - timeout: 5400 - - openstack-tox-py27: - timeout: 5400 - - openstack-tox-lower-constraints: - timeout: 5400 - keystone-dsvm-functional: irrelevant-files: *irrelevant-files - keystone-dsvm-py3-functional: |