From 817bb7d50b06b03b7c56c3bb70db69e1c98cea46 Mon Sep 17 00:00:00 2001
From: Ghanshyam <gmann@ghanshyammann.com>
Date: Wed, 22 Dec 2021 17:26:50 +0000
Subject: [PATCH] Revert "Pin Tempest to train-last(28.0.0) tag for
 stable/train testing"

This reverts commit 410d11ebc66e28d096646c178949639c285f3593.

Reason for revert: it caused the bug for tempest plugin, let's figure out that first and then cap the appropriate tempest version-  https://bugs.launchpad.net/tempest/+bug/1955418

Change-Id: Ie4305e7b6030d9edaa97a207a588b734cf7707dc
---
 stackrc            | 4 ++--
 tests/test_refs.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stackrc b/stackrc
index 1a0a7abd45..a4d2600b09 100644
--- a/stackrc
+++ b/stackrc
@@ -314,8 +314,8 @@ REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-$TARGET_BRANCH}
 
 # Tempest test suite
 TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
-TEMPEST_BRANCH=${TEMPEST_BRANCH:-train-last}
-TEMPEST_VENV_UPPER_CONSTRAINTS=${TEMPEST_VENV_UPPER_CONSTRAINTS:-$REQUIREMENTS_DIR/upper-constraints.txt}
+TEMPEST_BRANCH=${TEMPEST_BRANCH:-$BRANCHLESS_TARGET_BRANCH}
+TEMPEST_VENV_UPPER_CONSTRAINTS=${TEMPEST_VENV_UPPER_CONSTRAINTS:-master}
 
 
 ##############
diff --git a/tests/test_refs.sh b/tests/test_refs.sh
index d9b328294a..0f9aa4a5ca 100755
--- a/tests/test_refs.sh
+++ b/tests/test_refs.sh
@@ -15,7 +15,7 @@
 
 echo "Ensuring we don't have crazy refs"
 
-REFS=`grep BRANCH stackrc | grep -v 'TARGET_BRANCH' | grep -v 'NOVNC_BRANCH' | grep -v 'TEMPEST_BRANCH'`
+REFS=`grep BRANCH stackrc | grep -v 'TARGET_BRANCH' | grep -v 'NOVNC_BRANCH'`
 rc=$?
 if [[ $rc -eq 0 ]]; then
     echo "Branch defaults must be one of the *TARGET_BRANCH values. Found:"