Browse code

Merge "Use master upper-constraints when installing tempest plugins"

Zuul authored on 2019/03/13 01:15:56
Showing 1 changed files
... ...
@@ -673,7 +673,9 @@ function install_tempest {
673 673
 function install_tempest_plugins {
674 674
     pushd $TEMPEST_DIR
675 675
     if [[ $TEMPEST_PLUGINS != 0 ]] ; then
676
-        tox -evenv-tempest -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt $TEMPEST_PLUGINS
676
+        # The requirements might be on a different branch, while tempest & tempest plugins needs master requirements.
677
+        (cd $REQUIREMENTS_DIR && git show master:upper-constraints.txt) > u-c-m.txt
678
+        tox -evenv-tempest -- pip install -c u-c-m.txt $TEMPEST_PLUGINS
677 679
         echo "Checking installed Tempest plugins:"
678 680
         tox -evenv-tempest -- tempest list-plugins
679 681
     fi