Merge pull request #26532 from jkhelil/fix_firing_alert_noupgrade

ignore ClusterNotUpgradeable alert on a TechPreviewNoUpgrade cluster
openshift · Oct 26, 2021 · 309bbb4 · 309bbb4
2 parents b29b64b + 697c8cf
commit 309bbb4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go
@@ -341,11 +341,16 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() {
 		}
 
 		if isTechPreviewCluster(oc) {
-			allowedFiringAlerts = append(allowedFiringAlerts, helper.MetricCondition{
-				Selector: map[string]string{"alertname": "TechPreviewNoUpgrade"},
-				Text:     "Allow testing of TechPreviewNoUpgrade clusters, this will only fire when a FeatureGate has been installed",
-			},
-			)
+			allowedFiringAlerts = append(
+				allowedFiringAlerts,
+				helper.MetricCondition{
+					Selector: map[string]string{"alertname": "TechPreviewNoUpgrade"},
+					Text:     "Allow testing of TechPreviewNoUpgrade clusters, this will only fire when a FeatureGate has been installed",
+				},
+				helper.MetricCondition{
+					Selector: map[string]string{"alertname": "ClusterNotUpgradeable"},
+					Text:     "Allow testing of ClusterNotUpgradeable clusters, this will only fire when a FeatureGate has been installed",
+				})
 		}
 
 		pendingAlertsWithBugs := helper.MetricConditions{}