From dfcc58913078aae408163f656e7b202f69fa66d3 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Wed, 11 Dec 2024 09:36:04 -0500
Subject: [PATCH] make it possible to mark tests as flaky and exclude them from
 normal runs

---
 pkg/testsuites/standard_suites.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkg/testsuites/standard_suites.go b/pkg/testsuites/standard_suites.go
index 13894410bcb5..e87c38877e61 100644
--- a/pkg/testsuites/standard_suites.go
+++ b/pkg/testsuites/standard_suites.go
@@ -51,11 +51,25 @@ var staticSuites = []ginkgo.TestSuite{
 			if isDisabled(name) {
 				return false
 			}
-			return strings.Contains(name, "[Suite:openshift/conformance/parallel")
+			return strings.Contains(name, "[Suite:openshift/conformance/parallel") && !strings.Contains(name, "[OCPFlaky]")
 		},
 		Parallelism:          30,
 		MaximumAllowedFlakes: 15,
 	},
+	{
+		Name: "openshift/conformance/ocp-flaky",
+		Description: templates.LongDesc(`
+		Our flaky tests plus the portion of the openshift/conformance test suite that run in parallel.
+		`),
+		Matches: func(name string) bool {
+			if isDisabled(name) {
+				return false
+			}
+			return strings.Contains(name, "[Suite:openshift/conformance/parallel")
+		},
+		Parallelism:          30,
+		MaximumAllowedFlakes: 0,
+	},
 	{
 		Name: "openshift/conformance/serial",
 		Description: templates.LongDesc(`