openstack/devstack
Code Issues Proposed changes

Merge "Fix tempest upper-constraints"

Browse Source
This commit is contained in:
Zuul
2022-01-05 10:57:21 +00:00
committed by Gerrit Code Review
parent 3c98c21fec 2ef4a4c851
commit e091481341
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@@ -119,7 +119,9 @@ function set_tempest_venv_constraints {
local tmp_c local tmp_c
tmp_c=$1 tmp_c=$1
if [[ $TEMPEST_VENV_UPPER_CONSTRAINTS == "master" ]]; then if [[ $TEMPEST_VENV_UPPER_CONSTRAINTS == "master" ]]; then
(cd $REQUIREMENTS_DIR && git show master:upper-constraints.txt) > $tmp_c (cd $REQUIREMENTS_DIR &&
git show master:upper-constraints.txt 2>/dev/null ||
git show origin/master:upper-constraints.txt) > $tmp_c
else else
echo "Using $TEMPEST_VENV_UPPER_CONSTRAINTS constraints in Tempest virtual env." echo "Using $TEMPEST_VENV_UPPER_CONSTRAINTS constraints in Tempest virtual env."
cat $TEMPEST_VENV_UPPER_CONSTRAINTS > $tmp_c cat $TEMPEST_VENV_UPPER_CONSTRAINTS > $tmp_c