From 700783a82096de4f26a402e309e1b6fcfc146f9c Mon Sep 17 00:00:00 2001 From: Forrest Babcock Date: Tue, 16 Dec 2025 16:42:33 -0500 Subject: [PATCH 1/3] NO-JIRA: filter TestScopedProjectAccess tests --- pkg/test/ginkgo/cmd_runsuite.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go index 6b8bc2e3b7df..b4778e4c9a2c 100644 --- a/pkg/test/ginkgo/cmd_runsuite.go +++ b/pkg/test/ginkgo/cmd_runsuite.go @@ -433,6 +433,11 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc return k8sTestNames[t.name] }) + scopedProjectAccess, openshiftTests := splitTests(kubeTests, func(t *testCase) bool { + return strings.Contains(t.name, "TestScopedProjectAccess") + }) + logrus.Infof("Found %d scoped project access tests", len(scopedProjectAccess)) + storageTests, kubeTests := splitTests(kubeTests, func(t *testCase) bool { return strings.Contains(t.name, "[sig-storage]") }) From 9a691fac881b6a436c8bc8b8a8c99cabcf76285e Mon Sep 17 00:00:00 2001 From: Forrest Babcock Date: Tue, 16 Dec 2025 17:03:07 -0500 Subject: [PATCH 2/3] NO-JIRA: filter ProjectAPI tests --- pkg/test/ginkgo/cmd_runsuite.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go index b4778e4c9a2c..6a5c05308882 100644 --- a/pkg/test/ginkgo/cmd_runsuite.go +++ b/pkg/test/ginkgo/cmd_runsuite.go @@ -433,10 +433,9 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc return k8sTestNames[t.name] }) - scopedProjectAccess, openshiftTests := splitTests(kubeTests, func(t *testCase) bool { - return strings.Contains(t.name, "TestScopedProjectAccess") + projectAPITests, openshiftTests := splitTests(kubeTests, func(t *testCase) bool { + return strings.Contains(t.name, "ProjectAPI") }) - logrus.Infof("Found %d scoped project access tests", len(scopedProjectAccess)) storageTests, kubeTests := splitTests(kubeTests, func(t *testCase) bool { return strings.Contains(t.name, "[sig-storage]") @@ -466,6 +465,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc logrus.Infof("Found %d network tests", len(networkTests)) logrus.Infof("Found %d builds tests", len(buildsTests)) logrus.Infof("Found %d must-gather tests", len(mustGatherTests)) + logrus.Infof("Found %d ProjectAPI tests", len(projectAPITests)) // If user specifies a count, duplicate the kube and openshift tests that many times. expectedTestCount := len(early) + len(late) @@ -477,6 +477,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc originalNetwork := networkTests originalBuilds := buildsTests originalMustGather := mustGatherTests + originalProjectAPI := projectAPITests for i := 1; i < count; i++ { kubeTests = append(kubeTests, copyTests(originalKube)...) @@ -486,9 +487,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc networkTests = append(networkTests, copyTests(originalNetwork)...) buildsTests = append(buildsTests, copyTests(originalBuilds)...) mustGatherTests = append(mustGatherTests, copyTests(originalMustGather)...) + projectAPITests = append(projectAPITests, copyTests(originalProjectAPI)...) } } - expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(networkK8sTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests) + expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(networkK8sTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests) + len(projectAPITests) abortFn := neverAbort testCtx := ctx @@ -539,6 +541,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc mustGatherTestsCopy := copyTests(mustGatherTests) q.Execute(testCtx, mustGatherTestsCopy, parallelism, testOutputConfig, abortFn) tests = append(tests, mustGatherTestsCopy...) + + projectAPITestsCopy := copyTests(projectAPITests) + q.Execute(testCtx, projectAPITestsCopy, parallelism, testOutputConfig, abortFn) + tests = append(tests, projectAPITestsCopy...) } // TODO: will move to the monitor From 23edb78b6284f8cfd92675c708fdb907f0ff1910 Mon Sep 17 00:00:00 2001 From: Forrest Babcock Date: Thu, 18 Dec 2025 10:59:58 -0500 Subject: [PATCH 3/3] NO-JIRA: filter ProjectAPI tests --- pkg/test/ginkgo/cmd_runsuite.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go index 6a5c05308882..4652c622072e 100644 --- a/pkg/test/ginkgo/cmd_runsuite.go +++ b/pkg/test/ginkgo/cmd_runsuite.go @@ -433,10 +433,6 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc return k8sTestNames[t.name] }) - projectAPITests, openshiftTests := splitTests(kubeTests, func(t *testCase) bool { - return strings.Contains(t.name, "ProjectAPI") - }) - storageTests, kubeTests := splitTests(kubeTests, func(t *testCase) bool { return strings.Contains(t.name, "[sig-storage]") }) @@ -458,6 +454,11 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc return strings.Contains(t.name, "[sig-cli] oc adm must-gather") }) + // separate ProjectAPI tests + projectAPITests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool { + return strings.Contains(t.name, "ProjectAPI") + }) + logrus.Infof("Found %d openshift tests", len(openshiftTests)) logrus.Infof("Found %d kubernetes tests", len(kubeTests)) logrus.Infof("Found %d storage tests", len(storageTests))