Browse code

Merge "Respect constraints in tempest tox venvs"

Jenkins authored on 2016/02/19 06:03:11
Showing 1 changed files
... ...
@@ -321,7 +321,10 @@ function configure_tempest {
321 321
     local tmp_cfg_file
322 322
     tmp_cfg_file=$(mktemp)
323 323
     cd $TEMPEST_DIR
324
-    tox -revenv -- tempest verify-config -u -r -o $tmp_cfg_file
324
+    tox -revenv --notest
325
+    # NOTE(mtreinish): Respect constraints on tempest verify-config venv
326
+    tox -evenv -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
327
+    tox -evenv -- tempest verify-config -uro $tmp_cfg_file
325 328
 
326 329
     local compute_api_extensions=${COMPUTE_API_EXTENSIONS:-"all"}
327 330
     if [[ ! -z "$DISABLE_COMPUTE_API_EXTENSIONS" ]]; then
... ...
@@ -584,6 +587,10 @@ function install_tempest {
584 584
     pip_install tox
585 585
     pushd $TEMPEST_DIR
586 586
     tox --notest -efull
587
+    # NOTE(mtreinish) Respect constraints in the tempest full venv, things that
588
+    # are using a tox job other than full will not be respecting constraints but
589
+    # running pip install -U on tempest requirements
590
+    $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
587 591
     PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
588 592
     install_tempest_lib
589 593
     popd