From 39d40b2c206197efea499ae27298ecb8c4a49d5c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Fri, 12 Aug 2016 11:44:26 +0200
Subject: [PATCH] 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
---
 tools/tox_install.sh | 7 +------
 tox.ini              | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index c76227ecd..31e767aae 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -14,14 +14,9 @@ BRANCH_NAME=master
 
 set -e
 
-CONSTRAINTS_FILE=$1
+install_cmd="pip install -c$1"
 shift
 
-install_cmd="pip install"
-if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
-    install_cmd="$install_cmd -c$CONSTRAINTS_FILE"
-fi
-
 if [ $neutron_installed -eq 0 ]; then
     echo "ALREADY INSTALLED" > /tmp/tox_install.txt
     echo "Neutron already installed; using existing package"
diff --git a/tox.ini b/tox.ini
index 55f9c4e76..30f294dd1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,8 +57,6 @@ commands =
   python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:releasenotes]
-# TODO(ihrachys): remove 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]
@@ -70,14 +68,10 @@ commands =
 whitelist_externals = sh
 
 [testenv:cover]
-# TODO(ihrachys): remove 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_fwaas --testr-args='{posargs}'
 
 [testenv:venv]
-# TODO(ihrachys): remove once infra supports constraints for this target
-install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [testenv:docs]