openstack
/
neutron-vpnaas
Code Issues Proposed changes

Constrain remaining tox targets 

As per [1], we now can constrain targets that are executed in post
queue too.

[1] http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html

Change-Id: I02b28d3b354c3b175147c5be36eea4dc7e05f2a3
This commit is contained in:
Ihar Hrachyshka 2016-08-12 11:43:04 +02:00
parent 6017a356b7
commit 2941611807
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/tox_install.sh
View File

@ -22,11 +22,7 @@ BRANCH_NAME=master
set -e
install_cmd="pip install"
if [ "$1" = "constrained" ]; then
install_cmd="$install_cmd $2"
shift
fi
install_cmd="pip install -c$1"
shift
if [ -d "$NEUTRON_DIR" ]; then

11
tox.ini
View File

@ -7,7 +7,7 @@ skipsdist = True
setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
usedevelop = True
install_command = {toxinidir}/tools/tox_install.sh constrained -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = sh
@ -53,9 +53,6 @@ commands =
sh tools/pretty_tox.sh '{posargs}'
[testenv:releasenotes]
# TODO(pc_m): Remove install_command, once infra supports constraints for
# this target.
install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages}
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:pep8]
@ -71,16 +68,10 @@ whitelist_externals = sh
commands = python ./tools/check_i18n.py ./neutron-vpnaas ./tools/i18n_cfg.py
[testenv:cover]
# TODO(pc_m): Remove install_command, once infra supports constraints for
# this target.
install_command = {toxinidir}/tools/tox_install.sh unconstrained {opts} {packages}
commands =
python setup.py test --coverage --coverage-package-name=neutron_vpnaas --testr-args='{posargs}'
[testenv:venv]
# TODO(pc_m): Remove install_command, once infra supports constraints for
# this target.
install_command = pip install -U {opts} {packages}
commands = {posargs}
[testenv:docs]