From 5560aec95d65fddf9be04ac138a9f17b77009966 Mon Sep 17 00:00:00 2001 From: Arnav Meduri <58114756+arnavmeduri@users.noreply.github.com> Date: Thu, 4 Jun 2026 22:18:50 -0400 Subject: [PATCH 1/2] Turn off aggregation for 4.22 at GA --- .../_releases/priv/release-ocp-4.22.json | 125 ++++++++---------- .../_releases/release-ocp-4.22-ci.json | 23 +--- .../_releases/release-ocp-4.22.json | 49 +++---- 3 files changed, 75 insertions(+), 122 deletions(-) diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.22.json b/core-services/release-controller/_releases/priv/release-ocp-4.22.json index 9e97c3484b4f4..5b60f78d04790 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.22.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.22.json @@ -11,77 +11,6 @@ "referenceMode": "source", "to": "release-priv", "verify": { - "aggregated-aws-ovn-single-node-upgrade-4.22-micro": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "prowJob": { - "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-aws-upgrade-ovn-single-node-priv" - }, - "upgrade": true - }, - "aggregated-aws-ovn-upgrade-4.22-micro-fips": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "prowJob": { - "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips-priv" - }, - "upgrade": true - }, - "aggregated-azure-ovn-upgrade-4.22-micro": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "prowJob": { - "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-azure-ovn-upgrade-priv" - }, - "upgrade": true - }, - "aggregated-gcp-ovn-rt-upgrade-4.22-minor": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "prowJob": { - "name": "periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade-priv" - }, - "upgrade": true, - "upgradeFromRelease": { - "candidate": { - "stream": "nightly", - "version": "4.21" - } - } - }, - "aggregated-hypershift-aks-conformance-4.22": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-azure-aks-ovn-conformance-priv" - } - }, - "aggregated-hypershift-ovn-conformance-4.22": { - "aggregatedProwJob": { - "analysisJobCount": 10 - }, - "disabled": true, - "maxRetries": 2, - "prowJob": { - "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance-priv" - } - }, "aws-console": { "disabled": true, "optional": true, @@ -173,6 +102,14 @@ "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-single-node-techpreview-serial-priv" } }, + "aws-ovn-single-node-upgrade-4.22-micro": { + "disabled": true, + "maxRetries": 1, + "prowJob": { + "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-aws-upgrade-ovn-single-node-priv" + }, + "upgrade": true + }, "aws-ovn-single-node-upgrade-minor": { "disabled": true, "optional": true, @@ -215,6 +152,14 @@ "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-aws-ovn-techpreview-serial-3of3-priv" } }, + "aws-ovn-upgrade-4.22-micro-fips": { + "disabled": true, + "maxRetries": 1, + "prowJob": { + "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips-priv" + }, + "upgrade": true + }, "aws-ovn-upgrade-4.22-micro-fips-no-nat-instance": { "disabled": true, "optional": true, @@ -287,6 +232,14 @@ "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-azure-ovn-techpreview-serial-2of2-priv" } }, + "azure-ovn-upgrade-4.22-micro": { + "disabled": true, + "maxRetries": 1, + "prowJob": { + "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-azure-ovn-upgrade-priv" + }, + "upgrade": true + }, "azure-ovn-upgrade-out-of-change": { "disabled": true, "optional": true, @@ -353,6 +306,20 @@ "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-gcp-ovn-rt-priv" } }, + "gcp-ovn-rt-upgrade-4.22-minor": { + "disabled": true, + "maxRetries": 1, + "prowJob": { + "name": "periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade-priv" + }, + "upgrade": true, + "upgradeFromRelease": { + "candidate": { + "stream": "nightly", + "version": "4.21" + } + } + }, "gcp-ovn-serial": { "disabled": true, "optional": true, @@ -403,6 +370,14 @@ }, "upgrade": true }, + "hypershift-aks-conformance-4.22": { + "disabled": true, + "maxRetries": 1, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-azure-aks-ovn-conformance-priv" + } + }, "hypershift-kubevirt-ovn-conformance-4.22": { "disabled": true, "optional": true, @@ -410,6 +385,13 @@ "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-azure-kubevirt-ovn-priv" } }, + "hypershift-ovn-conformance-4.22": { + "disabled": true, + "maxRetries": 1, + "prowJob": { + "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance-priv" + } + }, "install-analysis-all": { "disabled": true, "maxRetries": 2, @@ -602,7 +584,6 @@ "rosa-classic-sts-conformance": { "disabled": true, "maxRetries": 1, - "optional": true, "prowJob": { "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-rosa-sts-ovn-priv" } diff --git a/core-services/release-controller/_releases/release-ocp-4.22-ci.json b/core-services/release-controller/_releases/release-ocp-4.22-ci.json index 1394fa829c63f..a12f7812c9159 100644 --- a/core-services/release-controller/_releases/release-ocp-4.22-ci.json +++ b/core-services/release-controller/_releases/release-ocp-4.22-ci.json @@ -24,8 +24,8 @@ } }, "verify": { - "aggregated-aws-ovn-upgrade-4.22-minor": { - "maxRetries": 2, + "aws-ovn-upgrade-4.22-minor": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-aws-ovn-upgrade" }, @@ -35,13 +35,10 @@ "stream": "ci", "version": "4.21" } - }, - "aggregatedProwJob": { - "analysisJobCount": 10 } }, - "aggregated-azure-ovn-upgrade-4.22-minor": { - "maxRetries": 2, + "azure-ovn-upgrade-4.22-minor": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade" }, @@ -51,20 +48,14 @@ "stream": "ci", "version": "4.21" } - }, - "aggregatedProwJob": { - "analysisJobCount": 10 } }, - "aggregated-gcp-ovn-upgrade-4.22-micro": { - "maxRetries": 2, + "gcp-ovn-upgrade-4.22-micro": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-gcp-ovn-upgrade" }, - "upgrade": true, - "aggregatedProwJob": { - "analysisJobCount": 10 - } + "upgrade": true }, "hypershift-e2e-aws": { "maxRetries": 1, diff --git a/core-services/release-controller/_releases/release-ocp-4.22.json b/core-services/release-controller/_releases/release-ocp-4.22.json index 94fc2f94fc4ac..ea079d1bfe9eb 100644 --- a/core-services/release-controller/_releases/release-ocp-4.22.json +++ b/core-services/release-controller/_releases/release-ocp-4.22.json @@ -34,15 +34,12 @@ } }, "verify": { - "aggregated-aws-ovn-upgrade-4.22-micro-fips": { - "maxRetries": 2, + "aws-ovn-upgrade-4.22-micro-fips": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips" }, - "upgrade": true, - "aggregatedProwJob": { - "analysisJobCount": 10 - } + "upgrade": true }, "aws-ovn-upgrade-4.22-micro-fips-no-nat-instance": { "optional": true, @@ -51,18 +48,15 @@ }, "upgrade": true }, - "aggregated-azure-ovn-upgrade-4.22-micro": { - "maxRetries": 2, + "azure-ovn-upgrade-4.22-micro": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-azure-ovn-upgrade" }, - "upgrade": true, - "aggregatedProwJob": { - "analysisJobCount": 10 - } + "upgrade": true }, - "aggregated-gcp-ovn-rt-upgrade-4.22-minor": { - "maxRetries": 2, + "gcp-ovn-rt-upgrade-4.22-minor": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-rt-upgrade" }, @@ -72,28 +66,19 @@ "stream": "nightly", "version": "4.21" } - }, - "aggregatedProwJob": { - "analysisJobCount": 10 } }, - "aggregated-hypershift-ovn-conformance-4.22": { - "maxRetries": 2, + "hypershift-ovn-conformance-4.22": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn-conformance" - }, - "aggregatedProwJob": { - "analysisJobCount": 10 } }, - "aggregated-hypershift-aks-conformance-4.22": { + "hypershift-aks-conformance-4.22": { "optional": true, - "maxRetries": 2, + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-azure-aks-ovn-conformance" - }, - "aggregatedProwJob": { - "analysisJobCount": 10 } }, "hypershift-kubevirt-ovn-conformance-4.22": { @@ -102,15 +87,12 @@ "name": "periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-azure-kubevirt-ovn" } }, - "aggregated-aws-ovn-single-node-upgrade-4.22-micro": { - "maxRetries": 2, + "aws-ovn-single-node-upgrade-4.22-micro": { + "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-ci-4.22-e2e-aws-upgrade-ovn-single-node" }, - "upgrade": true, - "aggregatedProwJob": { - "analysisJobCount": 10 - } + "upgrade": true }, "aws-console": { "optional": true, @@ -545,7 +527,6 @@ } }, "rosa-classic-sts-conformance": { - "optional": true, "maxRetries": 1, "prowJob": { "name": "periodic-ci-openshift-release-main-nightly-4.22-e2e-rosa-sts-ovn" From 35f13f737f895bee2c980e6a9cb55761e3e95345 Mon Sep 17 00:00:00 2001 From: Arnav Meduri <58114756+arnavmeduri@users.noreply.github.com> Date: Fri, 5 Jun 2026 09:31:01 -0400 Subject: [PATCH 2/2] trigger CI