[release-4.22] OCPBUGS-86865: Stabilize ocl 4.22

Makefile

@@ -121,7 +121,7 @@ else
 endif
 
 # install-skopeo is purposely omitted from this target because it is only
-# needed for a single test target (test-e2e-ocl).
+# needed for the e2e-ocl test targets (test-e2e-ocl-1of2, test-e2e-ocl-2of2).
 install-tools: install-golangci-lint install-go-junit-report install-setup-envtest
 
 # Runs golangci-lint
@@ -216,15 +216,11 @@ test-e2e-techpreview: install-go-junit-report
 test-e2e-single-node: install-go-junit-report
 	set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-single-node/ | ./hack/test-with-junit.sh $(@)
 
-test-e2e-ocl: install-go-junit-report install-skopeo
-	# Temporarily include /tmp/skopeo/bin in our PATH variable so that the test suite can find skopeo.
-	set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@)
-
 test-e2e-ocl-1of2: install-go-junit-report install-skopeo
 	set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-1of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)
 
 test-e2e-ocl-2of2: install-go-junit-report install-skopeo
-	set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-2of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)
+	set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 150m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-2of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)
 
 test-e2e-iri: install-go-junit-report
 	set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-iri/ | ./hack/test-with-junit.sh $(@)

pkg/controller/build/reconciler.go

@@ -191,6 +191,13 @@ func (b *buildReconciler) deleteMachineOSConfig(ctx context.Context, mosc *mcfgv
 	}
 
 	for _, mosb := range mosbList {
+		// Only delete MOSBs owned by this specific MOSC instance. A new MOSC
+		// with the same name (but different UID) may already exist and have
+		// created new MOSBs that match the same label selector.
+		if !metav1.IsControlledBy(mosb, mosc) {
+			klog.Infof("Skipping MachineOSBuild %s: not owned by deleted MachineOSConfig %s (UID %s)", mosb.Name, mosc.Name, mosc.UID)
+			continue
+		}
 		if err := b.deleteMachineOSBuild(ctx, mosb); err != nil {
 			return fmt.Errorf("could not delete MachineOSBuild %s for MachineOSConfig %s: %w", mosb.Name, mosc.Name, err)
 		}