Backport tox settings to unbreak jenkins jobs.
The stable/essex tox config for nova does not currently match the testing standards that jenkins expects. This backports in current changes so that jenkins coverage jobs should start passing for stable/essex. Change-Id: I0fd476c38d9aea7d1c60cb959d8c7ac30e515d77
This commit is contained in:
parent
17c78ebca1
commit
6c01c0163f
|
@ -25,8 +25,6 @@ output_file = nova/locale/nova.pot
|
||||||
[nosetests]
|
[nosetests]
|
||||||
verbosity=2
|
verbosity=2
|
||||||
detailed-errors=1
|
detailed-errors=1
|
||||||
with-openstack=1
|
cover-package = nova
|
||||||
openstack-red=0.05
|
cover-html = true
|
||||||
openstack-yellow=0.025
|
cover-erase = true
|
||||||
openstack-show-elapsed=1
|
|
||||||
openstack-color=1
|
|
||||||
|
|
29
tox.ini
29
tox.ini
|
@ -3,36 +3,25 @@ envlist = py26,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
|
NOSE_WITH_OPENSTACK=1
|
||||||
|
NOSE_OPENSTACK_COLOR=1
|
||||||
|
NOSE_OPENSTACK_RED=0.05
|
||||||
|
NOSE_OPENSTACK_YELLOW=0.025
|
||||||
|
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||||
|
NOSE_OPENSTACK_STDOUT=1
|
||||||
deps = -r{toxinidir}/tools/pip-requires
|
deps = -r{toxinidir}/tools/pip-requires
|
||||||
-r{toxinidir}/tools/test-requires
|
-r{toxinidir}/tools/test-requires
|
||||||
commands = /bin/bash run_tests.sh -N -P
|
commands = /bin/bash run_tests.sh -N -P
|
||||||
|
|
||||||
[testenv:hudson]
|
[tox:jenkins]
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
deps = pep8==1.0.1
|
deps = pep8==1.0.1
|
||||||
commands = /bin/bash run_tests.sh -N --pep8
|
commands = /bin/bash run_tests.sh -N --pep8
|
||||||
|
|
||||||
[testenv:coverage]
|
[testenv:cover]
|
||||||
commands = /bin/bash run_tests.sh -N -P --coverage
|
setenv = NOSE_WITH_COVERAGE=1
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:jenkins26]
|
|
||||||
basepython = python2.6
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
|
|
||||||
[testenv:jenkins27]
|
|
||||||
basepython = python2.7
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
|
|
||||||
[testenv:jenkinscover]
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = /bin/bash run_tests.sh -N --coverage
|
|
||||||
|
|
||||||
[testenv:jenkinsvenv]
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = {posargs}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue