diff --git a/tox.ini b/tox.ini index 47ef5ebc29..fc882cf236 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,8 @@ [tox] envlist = pep8,py39,bashate,pip-check-reqs minversion = 3.18.0 -ignore_basepython_conflict = True [tempestenv] -basepython = python3 sitepackages = False setenv = VIRTUAL_ENV={envdir} @@ -15,7 +13,6 @@ deps = -r{toxinidir}/requirements.txt [testenv] -basepython = python3 setenv = VIRTUAL_ENV={envdir} OS_LOG_CAPTURE=1 @@ -72,7 +69,6 @@ commands = oslo_debug_helper -t tempest/tests {posargs} [testenv:all] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} # 'all' includes slow tests setenv = {[tempestenv]setenv} @@ -93,7 +89,6 @@ sitepackages = True # 'all' includes slow tests setenv = {[tempestenv]setenv} -basepython = {[tempestenv]basepython} deps = {[tempestenv]deps} commands = echo "WARNING: The all-plugin env is deprecated and will be removed" @@ -106,7 +101,6 @@ sitepackages = True # 'all' includes slow tests setenv = {[tempestenv]setenv} -basepython = {[tempestenv]basepython} deps = {[tempestenv]deps} commands = find . -type f -name "*.pyc" -delete @@ -115,7 +109,6 @@ commands = [testenv:full] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # The regex below is used to select which tests to run and exclude the slow tag: @@ -129,7 +122,6 @@ commands = [testenv:integrated-full] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # The regex below is used to select which tests to run. It exclude the extra @@ -146,7 +138,6 @@ commands = [testenv:extra-tests] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # The regex below is used to select extra tests mentioned in @@ -161,7 +152,6 @@ commands = [testenv:full-parallel] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # But exlcude the extra tests mentioned in tools/tempest-extra-tests-list.txt @@ -173,7 +163,6 @@ commands = [testenv:api-microversion-tests] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '(^tempest\.api\.compute)|(^tempest\.api\.volume)' @@ -186,7 +175,6 @@ commands = [testenv:integrated-network] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex1 = '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' @@ -201,7 +189,6 @@ commands = [testenv:integrated-compute] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex1 = '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' @@ -216,7 +203,6 @@ commands = [testenv:integrated-placement] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex1 = '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' @@ -231,7 +217,6 @@ commands = [testenv:integrated-storage] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex1 = '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' @@ -246,7 +231,6 @@ commands = [testenv:integrated-object-storage] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex1 = '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' @@ -261,7 +245,6 @@ commands = [testenv:full-serial] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario|serial_tests))' @@ -275,7 +258,6 @@ commands = [testenv:scenario] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '(^tempest\.scenario)' @@ -287,7 +269,6 @@ commands = [testenv:smoke] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '\[.*\bsmoke\b.*\]' @@ -298,7 +279,6 @@ commands = [testenv:smoke-serial] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '\[.*\bsmoke\b.*\]' @@ -312,7 +292,6 @@ commands = [testenv:slow-serial] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '\[.*\bslow\b.*\]' @@ -324,7 +303,6 @@ commands = [testenv:slow] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # The regex below is used to select the slow tagged tests: @@ -336,7 +314,6 @@ commands = [testenv:multinode] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} # The regex below is used to select the multinode and smoke tagged tests @@ -348,7 +325,6 @@ commands = [testenv:ipv6-only] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '\[.*\bsmoke|ipv6|test_network_v6\b.*\]' @@ -369,7 +345,6 @@ commands = {posargs} [testenv:venv-tempest] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} commands = {posargs} @@ -513,7 +488,6 @@ commands = [testenv:stestr-master] envdir = .tox/tempest sitepackages = {[tempestenv]sitepackages} -basepython = {[tempestenv]basepython} setenv = {[tempestenv]setenv} deps = {[tempestenv]deps} regex = '\[.*\bsmoke\b.*\]'