From e3100794d1615fc6b4216f54e2f7859a33d60b05 Mon Sep 17 00:00:00 2001 From: Vlad Gridin Date: Thu, 14 Mar 2019 14:40:55 +0100 Subject: [PATCH] Fix installing tempest plugins When running stack.sh locally on stable branches with tempest enabled and TEMPEST_PLUGINS set, devstack will try to fetch master branch of requirements and that fails if branch is not tracked. Change-Id: Ia1ae6869a8fede2af5cd7c875e0946b6a75eb518 Closes-Bug: #1820051 (cherry picked from commit bcd8a50cc688ee39b4b998efe959e35c4c5b1408) --- lib/tempest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index ff62e4fea8..0bac72e985 100644 --- a/lib/tempest +++ b/lib/tempest @@ -672,7 +672,7 @@ function install_tempest_plugins { pushd $TEMPEST_DIR if [[ $TEMPEST_PLUGINS != 0 ]] ; then # 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 + (cd $REQUIREMENTS_DIR && git show origin/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