commit 05e622ead243325658ae5aff5b5b53ce60135c57
author yatinkarel <ykarel@redhat.com> Wed Dec 29 12:30:01 2021 +0530
committer Radosław Piliszek <radoslaw.piliszek@gmail.com> Wed Dec 29 09:48:39 2021 +0000
tree ce011b749657dad3177099d3840cf4871a725c5f
parent 24b65adc9cedff9c7a8ab412fb39613ef5d4a627

Use upper-constraints from in review changes

Currently upper-constraints.txt is not getting used
from in-review changes of requirements project and
leading to merge of broken requirements[1].

Use master branch to fetch constraints instead of
the remote branch.

[1] https://review.opendev.org/c/openstack/requirements/+/822575

Depends-On: https://review.opendev.org/c/openstack/requirements/+/823128
Change-Id: I5d42ac6b54bf20804d7e5faa39d1289102318b64

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index ab80217..bdbd3ca 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -119,7 +119,7 @@
     local tmp_c
     tmp_c=$1
     if [[ $TEMPEST_VENV_UPPER_CONSTRAINTS == "master" ]]; then
-        (cd $REQUIREMENTS_DIR && git show origin/master:upper-constraints.txt) > $tmp_c
+        (cd $REQUIREMENTS_DIR && git show 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