From b31640af5ef46e00e9cb0d2cffb22a043998eb31 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 2 May 2016 16:33:29 -0400 Subject: [PATCH] Handle common and seperate tempest tox venvs In order to support the effort to unify the tox venvs being created by tempest this commit temporarily cases the path of the venv being created. Once tempest is updated to only use .tox/tempest we can remove the if blocks and just use it unconditionally. Change-Id: I34a69020eee07156e64026781a3c0bffdb5ab415 --- lib/tempest | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/tempest b/lib/tempest index 6ba04f1680..3164de6638 100644 --- a/lib/tempest +++ b/lib/tempest @@ -594,8 +594,13 @@ function install_tempest { # NOTE(mtreinish) Respect constraints in the tempest full venv, things that # are using a tox job other than full will not be respecting constraints but # running pip install -U on tempest requirements - $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt - PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full + if [[ -d .tox/tempest ]] ; then + $TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt + PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest + else + $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt + PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full + fi popd }