Browse code

Merge "Handle common and seperate tempest tox venvs"

Jenkins authored on 2016/05/05 06:54:17
Showing 1 changed files
... ...
@@ -592,8 +592,13 @@ function install_tempest {
592 592
     # NOTE(mtreinish) Respect constraints in the tempest full venv, things that
593 593
     # are using a tox job other than full will not be respecting constraints but
594 594
     # running pip install -U on tempest requirements
595
-    $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
596
-    PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
595
+    if [[ -d .tox/tempest ]] ; then
596
+        $TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
597
+        PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
598
+    else
599
+        $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
600
+        PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
601
+    fi
597 602
     popd
598 603
 }
599 604