From 6f251db6d3f9ed9d735c176b55269d4574700004 Mon Sep 17 00:00:00 2001
From: Rajalakshmi-Girish <rajalakshmi.girish1@ibm.com>
Date: Thu, 7 Dec 2023 12:58:36 +0000
Subject: [PATCH] Fix issue 28445

---
 pkg/test/ginkgo/cmd_runsuite.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go
index 9647ebb8a831..3e5645260669 100644
--- a/pkg/test/ginkgo/cmd_runsuite.go
+++ b/pkg/test/ginkgo/cmd_runsuite.go
@@ -197,17 +197,6 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, mon
 
 	fmt.Fprintf(o.Out, "found %d filtered tests\n", len(tests))
 
-	restConfig, err := clusterinfo.GetMonitorRESTConfig()
-	if err != nil {
-		return err
-	}
-
-	// skip tests due to newer k8s
-	tests, err = o.filterOutRebaseTests(restConfig, tests)
-	if err != nil {
-		return err
-	}
-
 	count := o.Count
 	if count == 0 {
 		count = suite.Count
@@ -239,6 +228,17 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, mon
 		return nil
 	}
 
+	restConfig, err := clusterinfo.GetMonitorRESTConfig()
+	if err != nil {
+		return err
+	}
+
+	// skip tests due to newer k8s
+	tests, err = o.filterOutRebaseTests(restConfig, tests)
+	if err != nil {
+		return err
+	}
+
 	if len(o.JUnitDir) > 0 {
 		if _, err := os.Stat(o.JUnitDir); err != nil {
 			if !os.IsNotExist(err) {