Merge pull request #30325 from hongkailiu/revert-aca74c4009a1e252f37e8b563ead0bbb6b61c1ad

Revert "Revert "NO-JIRA: Add olm into the known operator set""

Author: openshift-merge-bot[bot]

pkg/monitortestlibrary/platformidentification/operator_mapping.go

@@ -111,6 +111,7 @@ var (
 		"monitoring",
 		"network",
 		"node-tuning",
+		"olm",
 		"openshift-apiserver",
 		"openshift-controller-manager",
 		"openshift-samples",
@@ -154,6 +155,7 @@ func init() {
 	utilruntime.Must(addOperatorMapping("monitoring", "Monitoring"))
 	utilruntime.Must(addOperatorMapping("network", "Networking"))
 	utilruntime.Must(addOperatorMapping("node-tuning", "Node Tuning Operator"))
+	utilruntime.Must(addOperatorMapping("olm", "OLM"))
 	utilruntime.Must(addOperatorMapping("openshift-apiserver", "openshift-apiserver"))
 	utilruntime.Must(addOperatorMapping("openshift-controller-manager", "openshift-controller-manager"))
 	utilruntime.Must(addOperatorMapping("openshift-samples", "Samples"))

pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go

@@ -401,6 +401,13 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
 			if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue {
 				return "https://issues.redhat.com/browse/OCPBUGS-39026", nil
 			}
+		case "olm":
+			if condition.Type == configv1.OperatorAvailable &&
+				condition.Status == configv1.ConditionFalse &&
+				(condition.Reason == "OperatorcontrollerDeploymentOperatorControllerControllerManager_Deploying" ||
+					condition.Reason == "CatalogdDeploymentCatalogdControllerManager_Deploying") {
+				return "https://issues.redhat.com/browse/OCPBUGS-62517", nil
+			}
 		case "openshift-apiserver":
 			if condition.Type == configv1.OperatorAvailable && condition.Status == configv1.ConditionFalse &&
 				(condition.Reason == "APIServerDeployment_NoDeployment" ||