1. devstack
  2. Commit 0945f431c09620e6699ad6f18969ffcaaa51c773
Browse code

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
(cherry picked from commit 412956a9738fa5c56aad6837a090bd2d1a3c50bf)

Matthew Treinish authored on 2016/05/03 05:33:29
Showing 1 changed files
lib/tempest
History View file @ 0945f43
... ... 
@@ -597,8 +597,13 @@ function install_tempest {
597 597 
     # NOTE(mtreinish) Respect constraints in the tempest full venv, things that
598 598 
     # are using a tox job other than full will not be respecting constraints but
599 599 
     # running pip install -U on tempest requirements
600 
-    $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
601 
-    PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
600 
+    if [[ -d .tox/tempest ]] ; then
601 
+        $TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
602 
+        PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
603 
+    else
604 
+        $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
605 
+        PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
606 
+    fi
602 607 
     install_tempest_lib
603 608 
     popd
604 609 
 }