From a2eb472c6de6c30667853090d98d16cbc5439609 Mon Sep 17 00:00:00 2001 From: Marek Schmidt Date: Thu, 13 Aug 2026 11:01:22 +0200 Subject: [PATCH] OCPBUGS-105461, allow baremetal to progress while MCO does --- .../legacycvomonitortests/operators.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go index 3af608055c79..84d466b5d8e2 100644 --- a/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go +++ b/pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go @@ -650,8 +650,6 @@ func testUpgradeOperatorProgressingStateTransitions(events monitorapi.Intervals, return fmt.Sprintf("%s completing its update within less than three minutes: %s", co, summary) } switch co { - case "baremetal": - return "https://issues.redhat.com/browse/OCPBUGS-66101" case "cloud-controller-manager": return "https://issues.redhat.com/browse/OCPBUGS-64852" case "operator-lifecycle-manager": @@ -710,6 +708,13 @@ func testUpgradeOperatorProgressingStateTransitions(events monitorapi.Intervals, except = func(co string, reason string) string { switch co { + case "baremetal": + // Since OCPBUGS-66101 was fixed, the baremetal operator intentionally reports Progressing=True + // during upgrades (reason SyncingResources, "Applying metal3 resources") while it syncs its + // metal3 resources, which legitimately overlaps with the machine-config progressing window. + if reason == "SyncingResources" { + return "baremetal is allowed to be Progressing=True while machine-config is progressing, as it applies metal3 resources during upgrades" + } case "authentication": if isTwoNode && (reason == "APIServerDeployment_NewGeneration" || reason == "APIServerDeployment_PodsUpdating") { return "authentication operator may roll oauth-apiserver (APIServerDeployment_NewGeneration or APIServerDeployment_PodsUpdating) during DualReplica upgrades while machine-config is progressing"