Skip to content

Commit a3f3ac8

Browse files
committed
Fail the test when an expected operator goes to degraded
1 parent d25eb09 commit a3f3ac8

File tree

1 file changed

+3
-15
lines changed
  • pkg/monitortests/clusterversionoperator/legacycvomonitortests

1 file changed

+3
-15
lines changed

pkg/monitortests/clusterversionoperator/legacycvomonitortests/operators.go

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ func testStableSystemOperatorStateTransitions(events monitorapi.Intervals, clien
138138
if operator == "cluster-autoscaler" {
139139
return "https://issues.redhat.com/browse/OCPBUGS-42875", nil
140140
}
141-
// flake this to collect more exceptions
142-
return "https://issues.redhat.com/browse/TRT-1575", nil
141+
return "", nil
143142
}
144143
return "We are not worried about other operator condition blips for stable-system tests yet.", nil
145144
}
@@ -301,12 +300,7 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
301300
return "https://issues.redhat.com/browse/OCPBUGS-38661", nil
302301
}
303302
default:
304-
// flake this to collect more exceptions
305-
if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue {
306-
return "outside of upgrade window https://issues.redhat.com/browse/TRT-1575", nil
307-
} else {
308-
return "", nil
309-
}
303+
return "", nil
310304
}
311305
} else {
312306
// SingleNode is expected to go Available=False and Degraded=True for most / all operators during upgrade
@@ -449,13 +443,7 @@ func testUpgradeOperatorStateTransitions(events monitorapi.Intervals, clientConf
449443
return "https://issues.redhat.com/browse/OCPBUGS-38663", nil
450444
}
451445
}
452-
453-
// flake this to collect more exceptions
454-
if condition.Type == configv1.OperatorDegraded && condition.Status == configv1.ConditionTrue {
455-
return "https://issues.redhat.com/browse/TRT-1575", nil
456-
} else {
457-
return "", nil
458-
}
446+
return "", nil
459447
}
460448

461449
return testOperatorStateTransitions(events, []configv1.ClusterStatusConditionType{configv1.OperatorAvailable, configv1.OperatorDegraded}, except, clientConfig)

0 commit comments

Comments
 (0)