Skip to content

Commit df7eb4f

Browse files
not-stbenjamclaude
andcommitted
OCPBUGS-84961: add kubernetes/conformance umbrella suite
Add a kubernetes/conformance suite that aggregates tests from kubernetes/conformance/parallel and kubernetes/conformance/serial, enabling `openshift-tests run kubernetes/conformance` to run all kubernetes conformance tests in a single invocation. Uses AddGlobalSuite (not AddSuite) so the umbrella starts with zero qualifiers and inherits exclusively from its children via the mergeParentQualifiers fixed-point loop in origin. AddSuite would prepend a catch-all source qualifier that bypasses the exclusion filters ([Disabled:], [Disruptive], [Slow], etc.) in the child qualifiers. Companion to openshift/origin#31261 which adds the Parents field and mergeParentQualifiers mechanism. Upstream: <carry> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 872bd37 commit df7eb4f

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,14 @@ func main() {
7070
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)},
7171
})
7272

73+
kubeTestsExtension.AddGlobalSuite(e.Suite{
74+
Name: "kubernetes/conformance",
75+
})
76+
7377
kubeTestsExtension.AddSuite(e.Suite{
7478
Name: "kubernetes/conformance/parallel",
7579
Parents: []string{
80+
"kubernetes/conformance",
7681
"openshift/conformance/parallel",
7782
},
7883
Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)},
@@ -81,6 +86,7 @@ func main() {
8186
kubeTestsExtension.AddSuite(e.Suite{
8287
Name: "kubernetes/conformance/serial",
8388
Parents: []string{
89+
"kubernetes/conformance",
8490
"openshift/conformance/serial",
8591
},
8692
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)},

0 commit comments

Comments
 (0)