Skip to content

NO-ISSUE: Add delays to reduce TestOSBuildController failures #5239

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
Sep 17, 2025
Merged

NO-ISSUE: Add delays to reduce TestOSBuildController failures #5239

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
12 changes: 8 additions & 4 deletions pkg/controller/build/osbuildcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func TestOSBuildController(t *testing.T) {
// new MachineOSBuild is produced from it. We'll do this 10 times.
for i := 0; i <= 5; i++ {
apiMosc := testhelpers.SetContainerfileContentsOnMachineOSConfig(ctx, t, mcfgclient, mosc, "FROM configs AS final"+fmt.Sprintf("%d", i))

time.Sleep(time.Millisecond * 200)
apiMCP, err := mcfgclient.MachineconfigurationV1().MachineConfigPools().Get(ctx, apiMosc.Spec.MachineConfigPool.Name, metav1.GetOptions{})
require.NoError(t, err)

Expand All @@ -306,6 +306,7 @@ func TestOSBuildController(t *testing.T) {
// Set the successful status on the job.
fixtures.SetJobStatus(ctx, t, kubeclient, mosb, fixtures.JobStatus{Succeeded: 1})
// The MachineOSBuild should be successful.
time.Sleep(time.Millisecond * 200)
kubeassert.MachineOSBuildIsSuccessful(mosb, "Expected the MachineOSBuild %s status to be successful", mosb.Name)
// And the build job should be deleted.
assertBuildObjectsAreDeleted(ctx, t, kubeassert, mosb)
Expand Down Expand Up @@ -333,6 +334,7 @@ func TestOSBuildController(t *testing.T) {
require.NoError(t, err)

apiMCP := insertNewRenderedMachineConfigAndUpdatePool(ctx, t, mcfgclient, mosc.Spec.MachineConfigPool.Name, getConfigNameForPool(i+2))
time.Sleep(time.Millisecond * 200)

mosb := buildrequest.NewMachineOSBuildFromAPIOrDie(ctx, kubeclient, apiMosc, apiMCP)
buildJobName := utils.GetBuildJobName(mosb)
Expand All @@ -342,6 +344,7 @@ func TestOSBuildController(t *testing.T) {
kubeassert.JobExists(buildJobName, "Build job did not get created for MachineConfigPool %q change", mcp.Name)
// Set the successful status on the job.
fixtures.SetJobStatus(ctx, t, kubeclient, mosb, fixtures.JobStatus{Succeeded: 1})
time.Sleep(time.Millisecond * 200)
// The MachineOSBuild should be successful.
kubeassert.MachineOSBuildIsSuccessful(mosb, "Expected the MachineOSBuild %s status to be successful", mosb.Name)
// And the build job should be deleted.
Expand Down Expand Up @@ -660,7 +663,7 @@ func setupOSBuildControllerForTestWithRunningBuild(ctx context.Context, t *testi
t.Helper()

kubeclient, mcfgclient, imageclient, routeclient, mosc, mosb, mcp, kubeassert, ctrl := setupOSBuildControllerForTestWithBuild(ctx, t, poolName)

time.Sleep(time.Millisecond * 200)
initialBuildJobName := utils.GetBuildJobName(mosb)

// After creating the new MachineOSConfig, a MachineOSBuild should be created.
Expand All @@ -671,7 +674,7 @@ func setupOSBuildControllerForTestWithRunningBuild(ctx context.Context, t *testi

// Set the running status on the job.
fixtures.SetJobStatus(ctx, t, kubeclient, mosb, fixtures.JobStatus{Active: 1})

time.Sleep(time.Millisecond * 200)
// The MachineOSBuild should be running.
kubeassert.Eventually().WithContext(ctx).MachineOSBuildIsRunning(mosb, "Expected the MachineOSBuild %s status to be running", mosb.Name)

Expand All @@ -682,10 +685,11 @@ func setupOSBuildControllerForTestWithSuccessfulBuild(ctx context.Context, t *te
t.Helper()

kubeclient, mcfgclient, imageclient, routeclient, mosc, mosb, mcp, kubeassert, _ := setupOSBuildControllerForTestWithRunningBuild(ctx, t, poolName)

time.Sleep(time.Millisecond * 200)
kubeassert.MachineOSBuildExists(mosb)
kubeassert.JobExists(utils.GetBuildJobName(mosb))
fixtures.SetJobStatus(ctx, t, kubeclient, mosb, fixtures.JobStatus{Succeeded: 1})
time.Sleep(time.Millisecond * 200)
kubeassert.MachineOSBuildIsSuccessful(mosb)
kubeassert.JobDoesNotExist(utils.GetBuildJobName(mosb))

Expand Down