Merge "Fix tempest upper-constraints"

2022-01-05 10:57:21 +00:00
parent 3c98c21fec 2ef4a4c851
commit e091481341
1 changed files with 3 additions and 1 deletions
--- a/lib/tempest
+++ b/lib/tempest
@@ -119,7 +119,9 @@ function set_tempest_venv_constraints {
    local tmp_c
    tmp_c=$1
    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
        echo "Using $TEMPEST_VENV_UPPER_CONSTRAINTS constraints in Tempest virtual env."
        cat $TEMPEST_VENV_UPPER_CONSTRAINTS > $tmp_c