Skip to content

Commit 0bf416d

Browse files
Merge pull request #30914 from fonta-rh/fix/microshift-skip-panic
OCPEDGE-2447: IsMicroShiftCluster: return error instead of calling Skip from container node
2 parents c3b5933 + e840e07 commit 0bf416d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

test/extended/util/framework.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,8 +2341,7 @@ func IsMicroShiftCluster(kubeClient k8sclient.Interface) (bool, error) {
23412341
e2e.Logf("IsMicroShiftCluster: error accessing microshift-version configmap: %v", err)
23422342
return false, nil
23432343
}); err != nil {
2344-
// Timeout accessing the configmap is a precondition failure
2345-
skipper.Skip(preconditions.FormatSkipMessage(fmt.Sprintf("microshift-version configmap check timed out after %s: %v", duration, err)))
2344+
e2e.Logf("IsMicroShiftCluster: timed out after %s: %v (assuming not MicroShift)", duration, err)
23462345
}
23472346
if cm == nil {
23482347
e2e.Logf("IsMicroShiftCluster: microshift-version configmap not found, not MicroShift")

0 commit comments

Comments
 (0)