From e89179e82f945f3ae01d46695311d458d43ea029 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Wed, 27 Feb 2019 11:10:05 +0000 Subject: [PATCH] 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 (cherry picked from commit 0d83e09464551a8eb4ee5c66dc82de7053b14d70) --- lib/tempest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index f429e26e4c..ce1d825c99 100644 --- a/lib/tempest +++ b/lib/tempest @@ -668,7 +668,9 @@ function install_tempest { function install_tempest_plugins { pushd $TEMPEST_DIR if [[ $TEMPEST_PLUGINS != 0 ]] ; then - tox -evenv-tempest -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt $TEMPEST_PLUGINS + # The requirements might be on a different branch, while tempest & tempest plugins needs master requirements. + (cd $REQUIREMENTS_DIR && git show master:upper-constraints.txt) > u-c-m.txt + tox -evenv-tempest -- pip install -c u-c-m.txt $TEMPEST_PLUGINS echo "Checking installed Tempest plugins:" tox -evenv-tempest -- tempest list-plugins fi