From 37dd59fd2cf9f95898130a5040c8241253ae8f77 Mon Sep 17 00:00:00 2001
From: Ben Parees <bparees@redhat.com>
Date: Tue, 17 Oct 2017 22:34:57 +0200
Subject: [PATCH] don't run conformance tests w/ serial unless they are part of
 the focus

---
 test/extended/setup.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/extended/setup.sh b/test/extended/setup.sh
index 5ec867afdb1e..ffd33e498523 100644
--- a/test/extended/setup.sh
+++ b/test/extended/setup.sh
@@ -21,7 +21,11 @@ function os::test::extended::focus () {
 		# the [Serial] tag to them as needed.
 		os::log::info ""
 		os::log::info "Running serial tests with focus ${FOCUS}"
-		TEST_REPORT_FILE_NAME=focus_serial os::test::extended::run -- -suite "serial.conformance.openshift.io" -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+		t=$FOCUS
+		FOCUS="\[Serial\].*?${t}"
+		TEST_REPORT_FILE_NAME=focus_serial os::test::extended::run -- -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
+		FOCUS="${t}.*?\[Serial\]"
+		TEST_REPORT_FILE_NAME=focus_serial2 os::test::extended::run -- -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
 
 		os::test::extended::merge_junit