Merge pull request #5054 from umohnani8/interruptbug

openshift-merge-bot[bot] · web-flow · commit 31f8b5e2d78b · 2025-05-15T13:53:44.000Z
OCPBUGS-53390: Fix interrupt state to account for failure correctly
diff --git a/pkg/controller/build/imagebuilder/jobimagebuilder.go b/pkg/controller/build/imagebuilder/jobimagebuilder.go
@@ -329,7 +329,7 @@ func (j *jobImageBuilder) validateBuilderType(builder buildrequest.Builder) erro
 func MapJobStatusToBuildStatus(job *batchv1.Job) (mcfgv1.BuildProgress, []metav1.Condition) {
 	// If the job is being deleted and it was not in either a successful or failed state
 	// then the MachineOSBuild should be considered "interrupted"
-	if job.DeletionTimestamp != nil && job.Status.Succeeded == 0 && job.Status.Failed == 0 {
+	if job.DeletionTimestamp != nil && job.Status.Succeeded == 0 && job.Status.Failed < constants.JobMaxRetries+1 {
 		return mcfgv1.MachineOSBuildInterrupted, apihelpers.MachineOSBuildInterruptedConditions()
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func (j *jobImageBuilder) validateBuilderType(builder buildrequest.Builder) erro`
`329`	`329`	`func MapJobStatusToBuildStatus(job *batchv1.Job) (mcfgv1.BuildProgress, []metav1.Condition) {`
`330`	`330`	`// If the job is being deleted and it was not in either a successful or failed state`
`331`	`331`	`// then the MachineOSBuild should be considered "interrupted"`
`332`		`- if job.DeletionTimestamp != nil && job.Status.Succeeded == 0 && job.Status.Failed == 0 {`
	`332`	`+ if job.DeletionTimestamp != nil && job.Status.Succeeded == 0 && job.Status.Failed < constants.JobMaxRetries+1 {`
`333`	`333`	`return mcfgv1.MachineOSBuildInterrupted, apihelpers.MachineOSBuildInterruptedConditions()`
`334`	`334`	`}`
`335`	`335`