WIP: fix operator reinstall in uninstall test cleanup

- Set InstallPlanApproval to Automatic on recreated Subscription
  (operator-sdk run bundle uses Manual, so OLM was waiting forever
  for approval)
- Wait for CSV to reach Succeeded phase before proceeding
- Re-enable --openshift.enabled=true on reinstalled CSV (the flag
  is added by enable_openshift() at deploy time and lost on reinstall)
- Always wait for operator deployment readiness (the previous
  isLastRegisteredTest check was buggy — alphabetical vs file order)
- Remove test registration mechanism (registerTest/isLastRegisteredTest)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: DavidRajnoha

test/e2e/aaa_uiplugin_uninstall_test.go

@@ -100,6 +100,7 @@ func TestUIPluginUninstallCleanup(t *testing.T) {
 			},
 			Spec: sub.Spec.DeepCopy(),
 		}
+		savedSub.Spec.InstallPlanApproval = olmv1alpha1.ApprovalAutomatic
 		t.Cleanup(func() {
 			if delay := *postponeRestoration; delay > 0 {
 				t.Logf("Cleanup: Waiting %v before restoring operator (inspect the cluster now)", delay)
@@ -109,14 +110,29 @@ func TestUIPluginUninstallCleanup(t *testing.T) {
 			forceDeleteAllUIPlugins(t, context.Background())
 			if err := f.K8sClient.Create(context.Background(), savedSub); err != nil {
 				if apierrors.IsAlreadyExists(err) {
-					t.Log("Cleanup: Subscription already exists, skipping")
+					t.Log("Cleanup: Subscription already exists, skipping create")
+				} else {
+					t.Logf("Cleanup: WARNING — failed to recreate Subscription: %v", err)
+					t.Log("Cleanup: Reinstall manually with: oc apply -f <subscription.yaml>")
 					return
 				}
-				t.Logf("Cleanup: WARNING — failed to recreate Subscription: %v", err)
-				t.Log("Cleanup: Reinstall manually with: oc apply -f <subscription.yaml>")
-				return
+			} else {
+				t.Log("Cleanup: Subscription recreated, OLM will reinstall the operator")
 			}
-			t.Log("Cleanup: Subscription recreated, OLM will reinstall the operator")
+
+			t.Log("Cleanup: Waiting for CSV to reach Succeeded phase...")
+			if err := waitForCSVSucceeded(t, ns, 5*time.Minute); err != nil {
+				t.Logf("Cleanup: WARNING — CSV did not reach Succeeded: %v", err)
+			} else if f.IsOpenshiftCluster {
+				t.Log("Cleanup: Re-enabling OpenShift mode on reinstalled CSV...")
+				if err := patchCSVOpenShiftEnabled(t, ns); err != nil {
+					t.Logf("Cleanup: WARNING — failed to patch CSV: %v", err)
+				}
+			}
+
+			t.Log("Cleanup: Waiting for operator deployment to become ready...")
+			f.AssertDeploymentReady("observability-operator", ns, framework.WithTimeout(5*time.Minute))(t)
+			t.Log("Cleanup: Operator is ready")
 		})
 	}
 
@@ -371,3 +387,74 @@ func assertNoManagedPodsRemain(t *testing.T, ctx context.Context, namespace stri
 		t.Fatalf("managed pods not cleaned up after UIPlugin deletion: %v", lastSeen)
 	}
 }
+
+// waitForCSVSucceeded polls until the observability-operator CSV reaches the Succeeded phase.
+func waitForCSVSucceeded(t *testing.T, namespace string, timeout time.Duration) error {
+	t.Helper()
+	return wait.PollUntilContextTimeout(context.Background(), 10*time.Second, timeout, true, func(ctx context.Context) (bool, error) {
+		csvs := &olmv1alpha1.ClusterServiceVersionList{}
+		if err := f.K8sClient.List(ctx, csvs, &client.ListOptions{Namespace: namespace}); err != nil {
+			return false, nil
+		}
+		for i := range csvs.Items {
+			if strings.Contains(csvs.Items[i].Name, "observability-operator") &&
+				csvs.Items[i].Status.Phase == olmv1alpha1.CSVPhaseSucceeded {
+				t.Logf("Cleanup: CSV %s is Succeeded", csvs.Items[i].Name)
+				return true, nil
+			}
+		}
+		return false, nil
+	})
+}
+
+// patchCSVOpenShiftEnabled patches the reinstalled CSV to add --openshift.enabled=true
+// to the operator container args. This is needed because operator-sdk run bundle +
+// enable_openshift() only patches the initial CSV; a reinstalled CSV loses the flag.
+func patchCSVOpenShiftEnabled(t *testing.T, namespace string) error {
+	t.Helper()
+	ctx := context.Background()
+
+	csvs := &olmv1alpha1.ClusterServiceVersionList{}
+	if err := f.K8sClient.List(ctx, csvs, &client.ListOptions{Namespace: namespace}); err != nil {
+		return fmt.Errorf("listing CSVs: %w", err)
+	}
+
+	for i := range csvs.Items {
+		csv := &csvs.Items[i]
+		if !strings.Contains(csv.Name, "observability-operator") {
+			continue
+		}
+
+		modified := false
+		for di := range csv.Spec.InstallStrategy.StrategySpec.DeploymentSpecs {
+			ds := &csv.Spec.InstallStrategy.StrategySpec.DeploymentSpecs[di]
+			if ds.Name != "observability-operator" {
+				continue
+			}
+			for ci := range ds.Spec.Template.Spec.Containers {
+				c := &ds.Spec.Template.Spec.Containers[ci]
+				if c.Name != "operator" {
+					continue
+				}
+				for _, arg := range c.Args {
+					if arg == "--openshift.enabled=true" {
+						t.Log("Cleanup: CSV already has --openshift.enabled=true")
+						return nil
+					}
+				}
+				c.Args = append(c.Args, "--openshift.enabled=true")
+				modified = true
+			}
+		}
+
+		if modified {
+			if err := f.K8sClient.Update(ctx, csv); err != nil {
+				return fmt.Errorf("updating CSV: %w", err)
+			}
+			t.Logf("Cleanup: Patched CSV %s with --openshift.enabled=true", csv.Name)
+		}
+		return nil
+	}
+
+	return fmt.Errorf("no observability-operator CSV found")
+}