Skip to content

OCPEDGE-2447: IsMicroShiftCluster: return error instead of calling Skip from container node #30914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 25, 2026
+1 −2
Merged

OCPEDGE-2447: IsMicroShiftCluster: return error instead of calling Skip from container node #30914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/extended/util/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,8 +2341,7 @@ func IsMicroShiftCluster(kubeClient k8sclient.Interface) (bool, error) {
e2e.Logf("IsMicroShiftCluster: error accessing microshift-version configmap: %v", err)
return false, nil
}); err != nil {
// Timeout accessing the configmap is a precondition failure
skipper.Skip(preconditions.FormatSkipMessage(fmt.Sprintf("microshift-version configmap check timed out after %s: %v", duration, err)))
e2e.Logf("IsMicroShiftCluster: timed out after %s: %v (assuming not MicroShift)", duration, err)
}
if cm == nil {
e2e.Logf("IsMicroShiftCluster: microshift-version configmap not found, not MicroShift")
Expand Down