commit 322b60153bc7be9b5e26f611e7f467e0c3a04c32
author Zuul <zuul@review.opendev.org> Wed Dec 01 20:14:23 2021 +0000
committer Gerrit Code Review <review@openstack.org> Wed Dec 01 20:14:23 2021 +0000
tree 629905af69796e96d1ee62acb1489ea0c4c5c540
parent 94e2f8fdf26dbeb36ff3abe34db3d4a4432ab905
parent 40b51c5d59705ae4946fa95a91f920f8098e3536

Merge "Define default OS_TEST_TIMEOUT for every tempest tox env"

tox.ini

diff --git a/tox.ini b/tox.ini
index 8cfe5ff..18f2aa6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@
 setenv =
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=./tempest/test_discover
+    OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
@@ -61,7 +62,6 @@
 # 'all' includes slow tests
 setenv =
     {[tempestenv]setenv}
-    OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
 deps = {[tempestenv]deps}
 commands =
     find . -type f -name "*.pyc" -delete
@@ -79,7 +79,6 @@
 # 'all' includes slow tests
 setenv =
     {[tempestenv]setenv}
-    OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
 basepython = {[tempestenv]basepython}
 deps = {[tempestenv]deps}
 commands =
@@ -93,7 +92,6 @@
 # 'all' includes slow tests
 setenv =
     {[tempestenv]setenv}
-    OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
 basepython = {[tempestenv]basepython}
 deps = {[tempestenv]deps}
 commands =