Browse code

Merge "use master upper-constraints when building tempest venv"

Zuul authored on 2018/03/11 22:19:42
Showing 1 changed files
... ...
@@ -554,7 +554,10 @@ function configure_tempest {
554 554
     if [[ "$OFFLINE" != "True" ]]; then
555 555
         tox -revenv-tempest --notest
556 556
     fi
557
-    tox -evenv-tempest -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
557
+
558
+    # The requirements might be on a different branch, while tempest needs master requirements.
559
+    git -C $REQUIREMENTS_DIR show master:upper-constraints.txt > u-c-m.txt
560
+    tox -evenv-tempest -- pip install -c u-c-m.txt -r requirements.txt
558 561
 
559 562
     # Auth:
560 563
     iniset $TEMPEST_CONFIG auth tempest_roles "Member"