Skip to content

Commit d6717d6

Browse files
Revert "OPRUN-4569: test: remove OTE exceptions for OLM"
This reverts merge commit cc8b969 (PR #31150). The OLM test exception removal broke SNO (Single Node OpenShift) upgrade tests because the packageserver still transitions to Progressing=True during the single-node reboot when there is no PDB protection. The fix in cluster-olm-operator PR #202 only addresses HA topology (2 replicas + PDB), not SNO where there is only one node and pod disruption is unavoidable. This restores the three exception callbacks: - olm Available=False during rolling update (OCPBUGS-62517) - olm Progressing=True during MCO upgrade window (OCPBUGS-62635) - operator-lifecycle-manager-packageserver Progressing=True on empty reason (OCPBUGS-63672) Blocking 5.0 nightly payloads since 5.0.0-0.nightly-2026-05-13-060200.
1 parent 793d403 commit d6717d6

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

  • pkg/monitortests/clusterversionoperator/legacycvomonitortests

pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,15 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
356356
(condition.Status == configv1.ConditionUnknown && condition.Reason == "UpdatingPrometheusFailed") {
357357
return "https://issues.redhat.com/browse/OCPBUGS-23745"
358358
}
359+
case "olm":
360+
if condition.Type == configv1.OperatorAvailable &&
361+
condition.Status == configv1.ConditionFalse &&
362+
// "OperatorcontrollerDeploymentOperatorControllerControllerManager_Deploying"
363+
// "CatalogdDeploymentCatalogdControllerManager_Deploying"
364+
// "CatalogdDeploymentCatalogdControllerManager_Deploying::OperatorcontrollerDeploymentOperatorControllerControllerManager_Deploying"
365+
strings.HasSuffix(condition.Reason, "ControllerManager_Deploying") {
366+
return "https://issues.redhat.com/browse/OCPBUGS-62517"
367+
}
359368
case "openshift-apiserver":
360369
if condition.Type == configv1.OperatorAvailable && condition.Status == configv1.ConditionFalse &&
361370
(condition.Reason == "APIServerDeployment_NoDeployment" ||
@@ -736,6 +745,16 @@ func testUpgradeOperatorProgressingStateTransitions(events monitorapi.Intervals,
736745
if reason == "_ManagedDeploymentsAvailable" {
737746
return "https://issues.redhat.com/browse/OCPBUGS-62633"
738747
}
748+
case "olm":
749+
// CatalogdDeploymentCatalogdControllerManager_Deploying
750+
// OperatorcontrollerDeploymentOperatorControllerControllerManager_Deploying
751+
if strings.HasSuffix(reason, "ControllerManager_Deploying") {
752+
return "https://issues.redhat.com/browse/OCPBUGS-62635"
753+
}
754+
case "operator-lifecycle-manager-packageserver":
755+
if reason == "" {
756+
return "https://issues.redhat.com/browse/OCPBUGS-63672"
757+
}
739758
}
740759
return ""
741760
}

0 commit comments

Comments
 (0)