Merge pull request #30425 from xueqzhan/revert-30269-1761318856486

TRT-2373: Revert #30269 "OTA-1626: fail CI if any ClusterOperator takes too long to update"

Author: openshift-merge-bot[bot]

pkg/defaultmonitortests/types.go

@@ -8,7 +8,6 @@ import (
 	"github.com/openshift/origin/pkg/monitortests/authentication/requiredsccmonitortests"
 	admupgradestatus "github.com/openshift/origin/pkg/monitortests/cli/adm_upgrade/status"
 	azuremetrics "github.com/openshift/origin/pkg/monitortests/cloud/azure/metrics"
-	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/clusterversionchecker"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/legacycvomonitortests"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/operatorstateanalyzer"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/terminationmessagepolicy"
@@ -173,7 +172,6 @@ func newUniversalMonitorTests(info monitortestframework.MonitorTestInitializatio
 	monitorTestRegistry.AddMonitorTestOrDie("termination-message-policy", "Cluster Version Operator", terminationmessagepolicy.NewAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("operator-state-analyzer", "Cluster Version Operator", operatorstateanalyzer.NewAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("required-scc-annotation-checker", "Cluster Version Operator", requiredsccmonitortests.NewAnalyzer())
-	monitorTestRegistry.AddMonitorTestOrDie("cluster-version-checker", "Cluster Version Operator", clusterversionchecker.NewClusterVersionChecker())
 
 	monitorTestRegistry.AddMonitorTestOrDie("etcd-log-analyzer", "etcd", etcdloganalyzer.NewEtcdLogAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("legacy-etcd-invariants", "etcd", legacyetcdmonitortests.NewLegacyTests())

pkg/monitor/monitorapi/identification_operator.go

@@ -1,8 +1,6 @@
 package monitorapi
 
 import (
-	"fmt"
-
 	configv1 "github.com/openshift/api/config/v1"
 )
 
@@ -27,18 +25,3 @@ func GetOperatorConditionStatus(interval Interval) *configv1.ClusterOperatorStat
 	condition.Message = interval.Message.HumanMessage
 	return condition
 }
-
-// GetOperatorConditionHumanMessage constructs a human-readable message from a given ClusterOperatorStatusCondition with a given prefix
-func GetOperatorConditionHumanMessage(s *configv1.ClusterOperatorStatusCondition, prefix string) string {
-	if s == nil {
-		return ""
-	}
-	switch {
-	case len(s.Reason) > 0 && len(s.Message) > 0:
-		return fmt.Sprintf("%s%s=%s: %s: %s", prefix, s.Type, s.Status, s.Reason, s.Message)
-	case len(s.Message) > 0:
-		return fmt.Sprintf("%s%s=%s: %s", prefix, s.Type, s.Status, s.Message)
-	default:
-		return fmt.Sprintf("%s%s=%s", prefix, s.Type, s.Status)
-	}
-}

pkg/monitortests/cli/adm_upgrade/status/monitortest.go

@@ -225,21 +225,23 @@ func (w *monitor) noFailures() *junitapi.JUnitTestCase {
 	}
 
 	var failures []string
+	var total int
 	for _, snap := range w.ocAdmUpgradeStatus {
+		total++
 		if snap.err != nil {
 			failures = append(failures, fmt.Sprintf("- %s: %v", snap.when.Format(time.RFC3339), snap.err))
 		}
 	}
 
-	if len(w.ocAdmUpgradeStatus) == 0 {
+	if total == 0 {
 		noFailures.SkipMessage = &junitapi.SkipMessage{
 			Message: "Test skipped because no oc adm upgrade status output was collected",
 		}
 		return noFailures
 	}
 
 	// Zero failures is too strict for at least SNO clusters
-	p := (float32(len(failures)) / float32(len(w.ocAdmUpgradeStatus))) * 100
+	p := (float32(len(failures)) / float32(total)) * 100
 	if (!w.isSNO && p > 0) || (w.isSNO && p > 10) {
 		noFailures.FailureOutput = &junitapi.FailureOutput{
 			Message: fmt.Sprintf("oc adm upgrade status failed %d times (of %d)", len(failures), len(w.ocAdmUpgradeStatus)),