Skip to content

Commit 8109ce1

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Use master upper-constraints when installing tempest plugins"
2 parents 10e31b4 + 0d83e09 commit 8109ce1

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

lib/tempest

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ function install_tempest {
673673
function install_tempest_plugins {
674674
pushd $TEMPEST_DIR
675675
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
677679
echo "Checking installed Tempest plugins:"
678680
tox -evenv-tempest -- tempest list-plugins
679681
fi

0 commit comments

Comments
 (0)