Skip to content

Commit 06a9b2a

Browse files
bshaw7claude
andcommitted
UPSTREAM: <carry>: OCPBUGS-84961: backport kubernetes/conformance umbrella suite
Backport the kubernetes/conformance suite with Conformance label filter from master (PRs #2682 and #2694 combined). The suite provides the minimal true upstream Kubernetes conformance tests used by OPCT for VCSP validations. Without this fix, running openshift-tests run kubernetes/conformance on 4.22 returns 'suite not found'. With this fix, the suite correctly selects only [Conformance]-labeled tests (~428 tests). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 7250fd5 commit 06a9b2a

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

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

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

73+
// kubernetes/conformance is used by OPCT to run the minimal true upstream
74+
// Kubernetes conformance tests, not the broader view OCP takes of what
75+
// "conformance" means.
76+
kubeTestsExtension.AddSuite(e.Suite{
77+
Name: "kubernetes/conformance",
78+
Qualifiers: []string{withExcludedTestsFilter(`labels.exists(l, l == "Conformance")`)},
79+
})
80+
7381
kubeTestsExtension.AddSuite(e.Suite{
7482
Name: "kubernetes/conformance/parallel",
7583
Parents: []string{

0 commit comments

Comments
 (0)