From 5b030c167814c2b10cb2e86f7e9f6374523000d3 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Thu, 2 Apr 2026 13:55:13 -0300
Subject: [PATCH] Drop rosa from blocking in 4.21 and 4.20

Removed from 4.22 lately, job is largely unmaintained and broken, we can't have patch managers getting blocked on it.
---
 core-services/release-controller/_releases/release-ocp-4.20.json | 1 +
 core-services/release-controller/_releases/release-ocp-4.21.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core-services/release-controller/_releases/release-ocp-4.20.json b/core-services/release-controller/_releases/release-ocp-4.20.json
index a8ecad3b7e5ca..058d68f68c447 100644
--- a/core-services/release-controller/_releases/release-ocp-4.20.json
+++ b/core-services/release-controller/_releases/release-ocp-4.20.json
@@ -432,6 +432,7 @@
       }
     },
     "rosa-classic-sts-conformance": {
+      "optional": true,
       "maxRetries": 1,
       "prowJob": {
         "name": "periodic-ci-openshift-release-main-nightly-4.20-e2e-rosa-sts-ovn"
diff --git a/core-services/release-controller/_releases/release-ocp-4.21.json b/core-services/release-controller/_releases/release-ocp-4.21.json
index d48a643c14172..7272ec3def2db 100644
--- a/core-services/release-controller/_releases/release-ocp-4.21.json
+++ b/core-services/release-controller/_releases/release-ocp-4.21.json
@@ -445,6 +445,7 @@
       }
     },
     "rosa-classic-sts-conformance": {
+      "optional": true,
       "maxRetries": 1,
       "prowJob": {
         "name": "periodic-ci-openshift-release-main-nightly-4.21-e2e-rosa-sts-ovn"