From 14db55261070741f0997ae0918a670609bb6d4bc Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Wed, 14 Feb 2018 15:37:41 +0530
Subject: [PATCH] Switch to stestr for generating subunit results

* https://review.openstack.org/#/c/504345/ moves the tempest run
  cli to stestr. In order to avoid breakage switch to stestr from testr.
* Check for .testresposity and .stestr folder and then use
  respective test runner. It will avoid the breakage in CI.

Change-Id: I1fdbe2f441a73f80d8d6e7a8263d300939a4fba3
(cherry picked from commit e7f235f4115d87d7a434653f660e145c9460ba25)
---
 run_tests.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 86eb0514c..fed6562a3 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -268,8 +268,13 @@ result=$?
 # Print output and generate subunit if results exist
 if [ -d /var/lib/tempest ]; then
     pushd /var/lib/tempest
-    $SUDO /usr/bin/testr last || true
-    $SUDO bash -c "/usr/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true
+    if [ -d .testrepository ]; then
+        $SUDO /usr/bin/testr last || true
+        $SUDO bash -c "/usr/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true
+    elif [ -d .stestr ]; then
+        $SUDO /usr/bin/stestr last || true
+        $SUDO bash -c "/usr/bin/stestr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true
+    fi
     popd
 fi