Skip to content

Commit 0d83e09

Browse files
author
ghanshyam
committed
Use master upper-constraints when installing tempest plugins
when tempst venv is build, it use the master upper_contraint[1] but when we install tempest plugin, it use branch upper_contraint. This leads to mismatch the dependency version between tempest and required tempest plugins setup. Current flow after this change is: 1. install tempest form master (until you explicitly change TEMPEST_BRANCH which is default to master in all stable branch). It applies the upper_constraint from the stable branch but that will be overridden in step2 2. configure tempest, here the created venv will install all dependency with master's upper_constraint. 3. install tempest plugins in same venv created above. Now tempest plugin will also use the master upper_constraint. With this tempest venv which has all enabled plugin will be contsraint with master. [1] https://github.com/openstack-dev/devstack/blob/72f632222f6d90d3545b5d7ca48297da4218e2ea/lib/tempest#L590 Change-Id: I89314e8391e8f26c622fc090cbe27997b3cf049a Closes-Bug: #1816022
1 parent 72f6322 commit 0d83e09

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)