Skip to content
Closed
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions openshift-hack/cmd/k8s-tests-ext/k8s-tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,16 @@ func main() {
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)},
})

// AddGlobalSuite so the umbrella starts with zero qualifiers and inherits
// exclusively from its children via mergeParentQualifiers in origin.
kubeTestsExtension.AddGlobalSuite(e.Suite{
Name: "kubernetes/conformance",
})

kubeTestsExtension.AddSuite(e.Suite{
Name: "kubernetes/conformance/parallel",
Parents: []string{
"kubernetes/conformance",
"openshift/conformance/parallel",
},
Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)},
Expand All @@ -81,6 +88,7 @@ func main() {
kubeTestsExtension.AddSuite(e.Suite{
Name: "kubernetes/conformance/serial",
Parents: []string{
"kubernetes/conformance",
"openshift/conformance/serial",
},
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)},
Expand Down