Skip to content

Add more OTE tests, drop ReleaseGate, fix test races #1516

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
jmencak wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add more OTE tests, drop ReleaseGate, fix test races #1516

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
51 changes: 24 additions & 27 deletions cmd/cluster-node-tuning-operator-test-ext/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ func main() {
Name: "openshift/cluster-node-tuning-operator/conformance/parallel",
Parents: []string{"openshift/conformance/parallel"},
Qualifiers: []string{
`(labels.exists(l, l=="ReleaseGate")) &&
!(name.contains("[Serial]") || name.contains("[Slow]") || name.contains("[Disruptive]"))`,
`!(name.contains("[Serial]") || name.contains("[Slow]") || name.contains("[Disruptive]")) && !name.contains("[Manual]")`,
},
})

Expand All @@ -43,46 +42,54 @@ func main() {
Name: "openshift/cluster-node-tuning-operator/conformance/serial",
Parents: []string{"openshift/conformance/serial"},
Qualifiers: []string{
`(labels.exists(l, l=="ReleaseGate")) &&
name.contains("[Serial]") && !name.contains("[Disruptive]")`,
`name.contains("[Serial]") && !name.contains("[Disruptive]") && !name.contains("[Manual]")`,
// refer to https://github.com/openshift/origin/blob/main/pkg/testsuites/standard_suites.go
},
})

// Suite: disruptive
// See: https://github.com/openshift/release/blob/508c08ff3d8dbff48604b94484a0ce63983710ba/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml#L2462
// This suite currently doesn't run in any CI jobs.
ext.AddSuite(e.Suite{
Name: "openshift/cluster-node-tuning-operator/disruptive",
Parents: []string{"openshift/disruptive-longrunning"},
Name: "openshift/cluster-node-tuning-operator/disruptive",
// Tests running in the "openshift/disruptive-longrunning" parent suite already struggle to complete within 4 hours.
// Create a separate openshift/release config for this if it is decided to run these in the CI.
Qualifiers: []string{
`(labels.exists(l, l=="ReleaseGate")) &&
name.contains("[Disruptive]")`,
`name.contains("[Disruptive]") && !name.contains("[Manual]")`,
},
})

// Suite: optional/slow (long-running tests)
// This suite doesn't run in any CI jobs.
ext.AddSuite(e.Suite{
Name: "openshift/cluster-node-tuning-operator/optional/slow",
Parents: []string{"openshift/optional/slow"},
Name: "openshift/cluster-node-tuning-operator/optional/slow",
Qualifiers: []string{
`(labels.exists(l, l=="ReleaseGate")) &&
name.contains("[Slow]") && !name.contains("[Disruptive]")`,
`name.contains("[Slow]") && !name.contains("[Disruptive]") && !name.contains("[Manual]")`,
},
})

// Suite: all (includes everything)
// Suite: all (includes everything except [Manual] tests)
ext.AddSuite(e.Suite{
Name: "openshift/cluster-node-tuning-operator/all",
Qualifiers: []string{
`(labels.exists(l, l=="ReleaseGate"))`,
},
Name: "openshift/cluster-node-tuning-operator/all",
Qualifiers: []string{`!name.contains("[Manual]")`},
})

specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()
if err != nil {
panic(fmt.Sprintf("couldn't build extension test specs from ginkgo: %+v", err.Error()))
}

// Ensure [Disruptive] tests are also [Serial]
specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
if strings.Contains(spec.Name, "[Disruptive]") && !strings.Contains(spec.Name, "[Serial]") {
spec.Name = strings.ReplaceAll(
spec.Name,
"[Disruptive]",
"[Serial][Disruptive]",
)
}
})

// Preserve original-name labels for renamed tests
specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
for label := range spec.Labels {
Expand All @@ -95,16 +102,6 @@ func main() {
}
})

// Ignore obsolete tests
ext.IgnoreObsoleteTests(
// "[sig-node-tuning] <test name here>",
)

// Initialize environment before running any tests
specs.AddBeforeAll(func() {
// do stuff
})

ext.AddSpecs(specs)
registry.Register(ext)

Expand Down
Loading