From ed47ba39044e0b6c39b76b22c5f60725dc882db1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 28 Feb 2021 23:57:48 +0900
Subject: [PATCH] Do not reset tempest version in CI

In CI jobs we fetch the specific version of tempest and use the files
cloned already, so we don't need to reset its version explicitly.

Change-Id: I0bae1f8e304e7f879fa3975f69067ff3864fd4ba
---
 run_tests.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index cc2df8383..5da0d797a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -109,13 +109,13 @@ if [ -d /home/zuul/src/opendev.org ]; then
             cp -R /home/zuul/src/opendev.org/openstack/tempest /tmp/openstack/tempest
         else
             git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest
-        fi
-        # Pin Tempest to TEMPEST_VERSION unless we're running inside the
-        # openstack/tempest gate.
-        if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then
-            pushd /tmp/openstack/tempest
-            git reset --hard $TEMPEST_VERSION
-            popd
+            # Pin Tempest to TEMPEST_VERSION unless we're running inside the
+            # openstack/tempest gate.
+            if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then
+                pushd /tmp/openstack/tempest
+                git reset --hard $TEMPEST_VERSION
+                popd
+            fi
         fi
     fi
 else