From aea477842f95bb094271613b8f215db43fac41d5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 17 Jul 2025 23:48:40 +0900
Subject: [PATCH] Switch back pre-upgrade check to source branch

... because commit 1fd4e26f6be38c4f5e4f9ac7321c7a3ef45276d7 was
backported.

Depends-on: https://review.opendev.org/955294
Change-Id: I8f999b05b0a0cbd12c059b80bb50652d7f8bdbc5
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 devstack/upgrade/resources.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 33d937e02f..0c02239daf 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -102,11 +102,7 @@ function _run_heat_integrationtests {
 
 function create {
     if [ "${RUN_HEAT_INTEGRATION_TESTS}" == "True" ]; then
-        # run heat integration tests instead of tempest smoke before create
-        # TODO(ramishra) switch to run tests from $BASE_DEVSTACK_DIR once
-        # https://review.opendev.org/c/openstack/heat/+/954938
-        # has been backported
-        _run_heat_integrationtests $TARGET_DEVSTACK_DIR
+        _run_heat_integrationtests $BASE_DEVSTACK_DIR
     fi
 
     source $TOP_DIR/openrc admin admin