Merge pull request #1238 from DavidHurta/add-cvo-tests-to-conformance-suite

OTA-1585: Add conformance test suites to the CVO tests extension

Author: openshift-merge-bot[bot]

cmd/cluster-version-operator-tests/main.go

@@ -17,8 +17,24 @@ 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]"))`,
+		},
+	})
+
+	// 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()