Fix periodic py27 oslo-with-master test
The tests http://logs.openstack.org/periodic/periodic-glance-py27-with-oslo-master/ fail due to changes in tox.ini, the substitutions do not work. Create separate py27 test environment and adjust the used tox environments for base-python. Change-Id: I482c2d891e5ee067235b2c62e958f1f571b6e6ad
This commit is contained in:
parent
79071c0ec2
commit
0a98c2733c
10
tox.ini
10
tox.ini
@ -5,8 +5,8 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython =
|
basepython =
|
||||||
{py27,debug-py27,debug,venv,cover,docs,bandit,pep8,api-ref,genconfig,releasenotes}: python2.7
|
{py27,debug-py27,debug,venv,cover,docs,bandit,pep8,api-ref,genconfig,releasenotes,py27-oslo-master}: python2.7
|
||||||
{py35,debug-py35}: python3.5
|
{py35,debug-py35,py35-oslo-master}: python3.5
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
@ -28,12 +28,16 @@ commands =
|
|||||||
debug: oslo_debug_helper {posargs}
|
debug: oslo_debug_helper {posargs}
|
||||||
debug{-py27,-py35}: oslo_debug_helper {posargs}
|
debug{-py27,-py35}: oslo_debug_helper {posargs}
|
||||||
docs: python setup.py build_sphinx
|
docs: python setup.py build_sphinx
|
||||||
py27: ostestr --slowest {posargs}
|
|
||||||
releasenotes: sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
releasenotes: sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
venv: {posargs}
|
venv: {posargs}
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
passenv = *_proxy *_PROXY
|
passenv = *_proxy *_PROXY
|
||||||
|
|
||||||
|
[testenv:py27]
|
||||||
|
# The periodic oslo-with-master test does not work with the
|
||||||
|
# conditionals in [testenv], use separate environment.
|
||||||
|
commands = ostestr --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
commands =
|
commands =
|
||||||
lockutils-wrapper python setup.py testr --slowest --testr-args='glance.tests.unit'
|
lockutils-wrapper python setup.py testr --slowest --testr-args='glance.tests.unit'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user