Skip to content

Mark openshift/conformance as explicit parent of parallel and serial suites #31259

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

Closed
redhat-chai-bot wants to merge 1 commit into from
Closed

Mark openshift/conformance as explicit parent of parallel and serial suites #31259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions pkg/test/ginkgo/test_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ type TestSuite struct {

// OTE
Qualifiers []string `json:"qualifiers,omitempty"`
Parents []string `json:"parents,omitempty"`
Extension *extensions.Extension `json:"-"`
}

Expand Down
18 changes: 15 additions & 3 deletions pkg/testsuites/standard_suites.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,19 @@ func AllTestSuites(ctx context.Context) ([]*ginkgo.TestSuite, error) {
}
}

// Also propagate qualifiers from internal suites that declare explicit Parents.
// This allows parent suites like "openshift/conformance" to aggregate tests from
// their children ("openshift/conformance/parallel", "openshift/conformance/serial").
for _, child := range suites {
for _, p := range child.Parents {
for _, parent := range suites {
if parent.Name == p {
parent.Qualifiers = append(parent.Qualifiers, child.Qualifiers...)
}
}
}
}

return suites, nil
}

Expand All @@ -120,16 +133,14 @@ var staticSuites = []ginkgo.TestSuite{
Description: templates.LongDesc(`
Tests that ensure an OpenShift cluster and components are working properly.
`),
Qualifiers: []string{
withExcludedTestsFilter("name.contains('[Suite:openshift/conformance/')"),
},
Parallelism: 30,
},
{
Name: "openshift/conformance/parallel",
Description: templates.LongDesc(`
Only the portion of the openshift/conformance test suite that run in parallel.
`),
Parents: []string{"openshift/conformance"},
Qualifiers: []string{
withExcludedTestsFilter("name.contains('[Suite:openshift/conformance/parallel')"),
},
Expand All @@ -141,6 +152,7 @@ var staticSuites = []ginkgo.TestSuite{
Description: templates.LongDesc(`
Only the portion of the openshift/conformance test suite that run serially.
`),
Parents: []string{"openshift/conformance"},
Qualifiers: []string{
// Standard early and late tests are included in the serial suite
withExcludedTestsFilter(withStandardEarlyOrLateTests("name.contains('[Suite:openshift/conformance/serial')")),
Expand Down