From 8e312d49ac7aea00422f3455f29b4ea4fd7b14ec Mon Sep 17 00:00:00 2001 From: David Hurta Date: Tue, 30 Sep 2025 18:45:23 +0200 Subject: [PATCH 1/2] test: Create conformance parallel test suite The sole existing test will be included in the test suite. For more information regarding test labels, see [1, 2] [1]: https://github.com/openshift/origin/tree/main/test/extended#test-labels [2]: Integration Guide for OpenShift Tests Extension --- cmd/cluster-version-operator-tests/main.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/cluster-version-operator-tests/main.go b/cmd/cluster-version-operator-tests/main.go index 69441c7d04..653c1cef1d 100644 --- a/cmd/cluster-version-operator-tests/main.go +++ b/cmd/cluster-version-operator-tests/main.go @@ -17,8 +17,15 @@ func main() { registry := extension.NewRegistry() ext := extension.NewExtension("openshift", "payload", "cluster-version-operator") + // Parallel tests must be able to run alongside any other test, and not be disruptive to the cluster’s normal operation. + // Tests should be as fast as possible; and less than 5 minutes in duration -- and typically much shorter. + // Longer tests need approval from the OCP architects. ext.AddSuite(extension.Suite{ - Name: "cluster-version-operator", + Name: "openshift/cluster-version-operator/conformance/parallel", + Parents: []string{"openshift/conformance/parallel"}, + Qualifiers: []string{ + `!(name.contains("[Serial]") || name.contains("[Slow]"))`, + }, }) specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite() From 37364492ff31648392a55e22e5086be5a22e86e9 Mon Sep 17 00:00:00 2001 From: David Hurta Date: Fri, 24 Oct 2025 17:32:46 +0200 Subject: [PATCH 2/2] test: Create conformance serial test suite For more information regarding test labels, see [1, 2] [1]: https://github.com/openshift/origin/tree/main/test/extended#test-labels [2]: Integration Guide for OpenShift Tests Extension --- cmd/cluster-version-operator-tests/main.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/cluster-version-operator-tests/main.go b/cmd/cluster-version-operator-tests/main.go index 653c1cef1d..cb3cf29ff5 100644 --- a/cmd/cluster-version-operator-tests/main.go +++ b/cmd/cluster-version-operator-tests/main.go @@ -28,6 +28,15 @@ func main() { }, }) + // Serial tests run in isolation, however they must return the cluster to its original state upon exiting. + ext.AddSuite(extension.Suite{ + Name: "openshift/cluster-version-operator/conformance/serial", + Parents: []string{"openshift/conformance/serial"}, + Qualifiers: []string{ + `name.contains("[Serial]")`, + }, + }) + specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite() if err != nil { panic(fmt.Sprintf("couldn't build extension test specs from ginkgo: %+v", err.Error()))