Skip to content

UPSTREAM: <carry>: fix kubernetes/conformance to filter on [Conformance] label #2694

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

Open
not-stbenjam wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

UPSTREAM: <carry>: fix kubernetes/conformance to filter on [Conformance] label #2694

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
12 changes: 6 additions & 6 deletions openshift-hack/cmd/k8s-tests-ext/k8s-tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,17 @@ 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",
// kubernetes/conformance is used by OCPT to run the minimal true upstream
// Kubernetes conformance tests, not the broader view OCP takes of what
// "conformance" means.
kubeTestsExtension.AddSuite(e.Suite{
Name: "kubernetes/conformance",
Qualifiers: []string{withExcludedTestsFilter(`labels.exists(l, l == "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 @@ -88,7 +89,6 @@ 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