From 013c18d329a8e39b6caa0d3a26404f2320bedfae Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 19 Sep 2019 15:41:25 -0700 Subject: [PATCH] Readjust job timeouts With the protection tests split out, the regular unit tests mostly shouldn't reach the 40 minute timeout limit unless they are extremely unlucky, so remove those overrides. The protection tests themselves are still extremely expensive even when split out from the rest of the tests, so bump their timeout to an hour. Change-Id: I247478f998d7fb84c486cc04a3040517721e0dd3 --- .zuul.yaml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index dcfbfb847f..7ea95164bb 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: