Merge "fix tox python3 overrides"
This commit is contained in:
commit
bed03f9e0a
9
tox.ini
9
tox.ini
@ -30,6 +30,7 @@ setenv =
|
||||
|
||||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
commands=
|
||||
bash -c "rm -rf doc/build"
|
||||
@ -43,6 +44,7 @@ extensions = .rst
|
||||
|
||||
|
||||
[testenv:releasenotes]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/doc/requirements.txt
|
||||
commands =
|
||||
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||
@ -50,11 +52,13 @@ commands =
|
||||
|
||||
# environment used by the -infra templated docs job
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
commands =
|
||||
{posargs}
|
||||
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
commands =
|
||||
bash -c "{toxinidir}/tests/common/test-pep8.sh"
|
||||
|
||||
@ -67,6 +71,7 @@ ignore=F403
|
||||
|
||||
|
||||
[testenv:bashate]
|
||||
basepython = python3
|
||||
commands =
|
||||
bash -c "{toxinidir}/tests/common/test-bashate.sh"
|
||||
|
||||
@ -93,6 +98,7 @@ commands =
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
[testenv:upgrade]
|
||||
basepython = python3
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml
|
||||
@ -102,6 +108,7 @@ commands =
|
||||
|
||||
|
||||
[testenv:func_lxd]
|
||||
basepython = python3
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
ANSIBLE_OVERRIDES={toxinidir}/tests/os_nova-overrides-lxd.yml
|
||||
@ -110,6 +117,7 @@ commands =
|
||||
|
||||
|
||||
[testenv:ssl]
|
||||
basepython = python3
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
|
||||
@ -118,6 +126,7 @@ commands =
|
||||
|
||||
|
||||
[testenv:linters]
|
||||
basepython = python3
|
||||
commands =
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
|
||||
{[testenv:pep8]commands}
|
||||
|
Loading…
x
Reference in New Issue
Block a user