Skip to content

OCPBUGS-84867: Fix OCL test to handle temporarily empty current-machine-os-build annotation #5913

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

Open
dkhater-redhat wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Open

OCPBUGS-84867: Fix OCL test to handle temporarily empty current-machine-os-build annotation #5913

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
5 changes: 4 additions & 1 deletion test/e2e-ocl-1of2/onclusterlayering_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,10 @@ func waitForMOSCToUpdateCurrentMOSB(ctx context.Context, t *testing.T, cs *frame
}

currentMOSB = mosc.GetAnnotations()[constants.CurrentMachineOSBuildAnnotationKey]
return currentMOSB != mosbName, nil
// Wait for annotation to be non-empty AND different from the old MOSB.
// The stale annotation fix may temporarily clear the annotation, so we need
// to wait for the new MOSB to be created and annotation set.
return currentMOSB != "" && currentMOSB != mosbName, nil

}))
return currentMOSB
Expand Down