From 81bf9537018486b9c4ef7985daaec901fbdc2a1b Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 8 May 2019 16:03:15 -0400 Subject: [PATCH] Make sure we install cinder requirements during the correct tox phase When runnign tests under tox the virtualenv is created in a number of phases (in brush strokes) 0. virtualenv -p $python .tox/$dir 1. pip install $deps 2. pip install . Step 2 is run without any deps as they're all supposed to be installed in phase 2 We have constraints in 'deps' we need to install all of cinders requirements during phase 2. If we don't then we get unconstrained versions being installed during phase 2. This shows up in a py27 run[1] as the absence of taskflow, and then in [2] with new dependancies being installed [1] http://logs.openstack.org/34/647934/3/check/openstack-tox-py27/93180f1/tox/py27-1.log [2] http://logs.openstack.org/34/647934/3/check/openstack-tox-py27/93180f1/tox/py27-2.log Change-Id: I5b1c285680f7c3256a707ea5973573f1176d4a26 (cherry picked from commit f12fda8ffbb42e71108701b38c09618997b836c3) (cherry picked from commit aecb6100e296aed7235635a5b18a0835fd2aca34) --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index e3d895853c8..8d7af9e6f79 100644 --- a/tox.ini +++ b/tox.ini @@ -13,8 +13,9 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./cinder/tests/unit usedevelop = True install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} {opts} {packages} - -deps = -r{toxinidir}/test-requirements.txt +deps = + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt # By default stestr will set concurrency # to ncpu, to specify something else use