Limit tox version to <4
This patch limitis the tox version to <4 in stable/wallaby. Related-Bug: #1999558 Change-Id: I9c62d429bb819336da05055fecd08e3816986bf8
This commit is contained in:
parent
c2e24d3d40
commit
723a2ef36a
@ -1,6 +1,8 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- ensure-tox
|
- role: ensure-tox
|
||||||
|
vars:
|
||||||
|
ensure_tox_version: "<4"
|
||||||
# TODO(slaweq): remove it when nftables will support syntax for src and
|
# TODO(slaweq): remove it when nftables will support syntax for src and
|
||||||
# destination IP addresses in arp tables:
|
# destination IP addresses in arp tables:
|
||||||
- legacy_ebtables
|
- legacy_ebtables
|
||||||
|
@ -4,5 +4,7 @@
|
|||||||
bindep_profile: test
|
bindep_profile: test
|
||||||
bindep_dir: "{{ zuul_work_dir }}"
|
bindep_dir: "{{ zuul_work_dir }}"
|
||||||
- test-setup
|
- test-setup
|
||||||
- ensure-tox
|
- role: ensure-tox
|
||||||
|
vars:
|
||||||
|
ensure_tox_version: "<4"
|
||||||
- tox
|
- tox
|
||||||
|
44
tox.ini
44
tox.ini
@ -1,7 +1,7 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = docs,py38,pep8
|
envlist = docs,py38,pep8
|
||||||
minversion = 3.2.0
|
minversion = 3.2.0
|
||||||
skipsdist = True
|
skipsdist = False
|
||||||
ignore_basepython_conflict = True
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
@ -12,16 +12,24 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
|
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
|
||||||
OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:180}
|
OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:180}
|
||||||
PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site
|
PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site
|
||||||
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY TOX_ENV_SRC_MODULES
|
passenv = TRACE_FAILONLY
|
||||||
|
GENERATE_HASHES
|
||||||
|
http_proxy
|
||||||
|
HTTP_PROXY
|
||||||
|
https_proxy
|
||||||
|
HTTPS_PROXY
|
||||||
|
no_proxy
|
||||||
|
NO_PROXY
|
||||||
|
TOX_ENV_SRC_MODULES
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
deps =
|
deps =
|
||||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
|
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
||||||
whitelist_externals = sh
|
allowlist_externals = bash
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}"
|
bash {toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}"
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
# there is also secret magic in ostestr which lets you run in a fail only
|
# there is also secret magic in ostestr which lets you run in a fail only
|
||||||
@ -63,7 +71,7 @@ setenv = {[testenv:functional]setenv}
|
|||||||
deps =
|
deps =
|
||||||
{[testenv:functional]deps}
|
{[testenv:functional]deps}
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
||||||
stestr run --group_regex=neutron\.tests\.functional\.db\.test_migrations\.(TestModelsMigrationsPsql|TestModelsMigrationsMysql) {posargs}
|
stestr run --group_regex=neutron\.tests\.functional\.db\.test_migrations\.(TestModelsMigrationsPsql|TestModelsMigrationsMysql) {posargs}
|
||||||
|
|
||||||
[testenv:dsvm-fullstack]
|
[testenv:dsvm-fullstack]
|
||||||
@ -79,16 +87,16 @@ setenv = {[testenv]setenv}
|
|||||||
deps =
|
deps =
|
||||||
{[testenv:functional]deps}
|
{[testenv:functional]deps}
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
|
bash {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
|
||||||
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
||||||
stestr run --concurrency 3 {posargs}
|
stestr run --concurrency 3 {posargs}
|
||||||
|
|
||||||
[testenv:dsvm-fullstack-gate]
|
[testenv:dsvm-fullstack-gate]
|
||||||
setenv = {[testenv:dsvm-fullstack]setenv}
|
setenv = {[testenv:dsvm-fullstack]setenv}
|
||||||
deps = {[testenv:dsvm-fullstack]deps}
|
deps = {[testenv:dsvm-fullstack]deps}
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
|
bash {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
|
||||||
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
||||||
stestr run --concurrency 3 --black-regex neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
|
stestr run --concurrency 3 --black-regex neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
|
||||||
stestr run --combine --concurrency 1 neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
|
stestr run --combine --concurrency 1 neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
|
||||||
|
|
||||||
@ -107,20 +115,18 @@ deps =
|
|||||||
pylint==2.5.3 # GPLv2
|
pylint==2.5.3 # GPLv2
|
||||||
commands=
|
commands=
|
||||||
# If it is easier to add a check via a shell script, consider adding it in this file
|
# If it is easier to add a check via a shell script, consider adding it in this file
|
||||||
sh ./tools/misc-sanity-checks.sh
|
bash ./tools/misc-sanity-checks.sh
|
||||||
{toxinidir}/tools/check_unit_test_structure.sh
|
bash {toxinidir}/tools/check_unit_test_structure.sh
|
||||||
# Checks for coding and style guidelines
|
# Checks for coding and style guidelines
|
||||||
flake8
|
flake8
|
||||||
sh ./tools/coding-checks.sh --pylint '{posargs}'
|
bash ./tools/coding-checks.sh --pylint '{posargs}'
|
||||||
neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
|
neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
|
||||||
python ./tools/list_moved_globals.py
|
python ./tools/list_moved_globals.py
|
||||||
{[testenv:genconfig]commands}
|
{[testenv:genconfig]commands}
|
||||||
{[testenv:bashate]commands}
|
{[testenv:bashate]commands}
|
||||||
{[testenv:bandit]commands}
|
{[testenv:bandit]commands}
|
||||||
{[testenv:genpolicy]commands}
|
{[testenv:genpolicy]commands}
|
||||||
whitelist_externals =
|
allowlist_externals = bash
|
||||||
sh
|
|
||||||
bash
|
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
envdir = {toxworkdir}/shared
|
envdir = {toxworkdir}/shared
|
||||||
@ -151,7 +157,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html
|
|||||||
[testenv:pdf-docs]
|
[testenv:pdf-docs]
|
||||||
envdir = {toxworkdir}/docs
|
envdir = {toxworkdir}/docs
|
||||||
deps = {[testenv:docs]deps}
|
deps = {[testenv:docs]deps}
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
make
|
make
|
||||||
commands =
|
commands =
|
||||||
sphinx-build -W -b latex doc/source doc/build/pdf
|
sphinx-build -W -b latex doc/source doc/build/pdf
|
||||||
@ -237,7 +243,7 @@ commands = bash -c "find {toxinidir} \
|
|||||||
|
|
||||||
[testenv:genconfig]
|
[testenv:genconfig]
|
||||||
envdir = {toxworkdir}/shared
|
envdir = {toxworkdir}/shared
|
||||||
commands = {toxinidir}/tools/generate_config_file_samples.sh
|
commands = bash {toxinidir}/tools/generate_config_file_samples.sh
|
||||||
|
|
||||||
[testenv:genpolicy]
|
[testenv:genpolicy]
|
||||||
envdir = {toxworkdir}/shared
|
envdir = {toxworkdir}/shared
|
||||||
@ -256,6 +262,6 @@ commands = bindep test
|
|||||||
[testenv:requirements]
|
[testenv:requirements]
|
||||||
deps =
|
deps =
|
||||||
-egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
|
-egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
|
||||||
whitelist_externals = sh
|
allowlist_externals = bash
|
||||||
commands =
|
commands =
|
||||||
sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'
|
bash -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'
|
||||||
|
Loading…
Reference in New Issue
Block a user