From 7ffb8b2ae651d4e381c3edbd6a2bf5d4dcf1ea2d Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 15 Jun 2026 13:17:06 -0400 Subject: [PATCH] UPSTREAM: : fix kubernetes/conformance to filter on [Conformance] label The kubernetes/conformance suite was incorrectly defined as an AddGlobalSuite parent umbrella with no qualifiers, inheriting everything from its children. This caused it to include OCP's broader view of conformance rather than just the upstream Kubernetes conformance tests. Change it to a standalone AddSuite that filters on the Conformance label, matching only the 428 true upstream conformance tests. Also remove kubernetes/conformance from the Parents of the parallel and serial suites so all three are standalone. Co-Authored-By: Claude Opus 4.6 --- openshift-hack/cmd/k8s-tests-ext/k8s-tests.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go index 113f3dab1cd7f..e20ae39ef966a 100644 --- a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go +++ b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go @@ -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]'))`)}, @@ -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]'))`)},