Skip to content

NO-JIRA: filter TestScopedProjectAccess tests #30617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
neisw wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

NO-JIRA: filter TestScopedProjectAccess tests #30617

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700783a
NO-JIRA: filter TestScopedProjectAccess tests
neisw Dec 16, 2025
9a691fa
NO-JIRA: filter ProjectAPI tests
neisw Dec 16, 2025
23edb78
NO-JIRA: filter ProjectAPI tests
neisw Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/test/ginkgo/cmd_runsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,19 @@ 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))
logrus.Infof("Found %d network k8s tests", len(networkK8sTests))
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)
Expand All @@ -472,6 +478,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)...)
Expand All @@ -481,9 +488,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
Expand Down Expand Up @@ -534,6 +542,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
Expand Down