From bb4eededb059efc42b1b0b251f21305f00bbee26 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 29 Mar 2017 05:13:18 -0500
Subject: [PATCH] Update tox build settings

Remove heatclient and magnumclient from install-tips

We do not consume them anymore, so do not need to install them as part
of our tips testing.

Install from pip using upper-constraints. To ensure we work with
OpenStack releases.

Change-Id: I98f39d2e2a591eb84a1ebcd033eb51e1758f1f39
---
 extras/install-tips.sh |  4 +---
 tox.ini                | 19 ++-----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/extras/install-tips.sh b/extras/install-tips.sh
index 66b7a0af1..562270189 100644
--- a/extras/install-tips.sh
+++ b/extras/install-tips.sh
@@ -16,15 +16,13 @@
 
 for lib in \
         os-client-config \
-        keystoneauth \
         python-novaclient \
         python-keystoneclient \
         python-cinderclient \
         python-neutronclient \
         python-ironicclient \
-        python-heatclient \
         python-designateclient \
-        python-magnumclient
+        keystoneauth
 do
     egg=$(echo $lib | tr '-' '_' | sed 's/python-//')
     if [ -d /opt/stack/new/$lib ] ; then
diff --git a/tox.ini b/tox.ini
index 3a82b0c17..2c43c7776 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,30 +5,15 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -U {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    LANG=en_US.UTF-8
    LANGUAGE=en_US:en
    LC_ALL=C
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
-[testenv:record]
-usedevelop = True
-install_command = pip install -U {opts} {packages}
-setenv =
-   VIRTUAL_ENV={envdir}
-   LANG=en_US.UTF-8
-   LANGUAGE=en_US:en
-   LC_ALL=C
-   BETAMAX_RECORD_FIXTURES=1
-passenv = SHADE_OS_CLOUD
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='--concurrency=1 {posargs}'
-
 [testenv:functional]
 setenv =
    OS_TEST_PATH = ./shade/tests/functional