test/e2e/upgrade: ensure ClusterOperators test always produces a result

The ClusterOperators test was defined as a deferred function inside the
clusterUpgrade function, which meant it would not run if the parent test
"Cluster should remain functional during upgrade" failed before calling
clusterUpgrade (e.g., during config loading or upgrade context setup).

Move the deferred test to the parent test scope so it always runs and
produces a result, even when earlier tests fail. Also remove the duplicate
non-deferred version that only ran on success.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: stbenjam

test/e2e/upgrade/upgrade.go

@@ -177,6 +177,20 @@ var _ = g.Describe("[sig-arch][Feature:ClusterUpgrade]", func() {
 		upgCtx, err := getUpgradeContext(client, upgradeToImage)
 		framework.ExpectNoError(err, "determining what to upgrade to version=%s image=%s", "", upgradeToImage)
 
+		// Ensure ClusterOperators test always runs, even if earlier tests fail
+		defer func() {
+			_ = disruption.RecordJUnit(
+				f,
+				"[sig-cluster-lifecycle] ClusterOperators are available and not degraded after upgrade",
+				func() (error, bool) {
+					if err := operator.WaitForOperatorsToSettle(context.TODO(), client, 5); err != nil {
+						return err, false
+					}
+					return nil, false
+				},
+			)
+		}()
+
 		disruption.Run(f, "Cluster upgrade", "upgrade",
 			disruption.TestData{
 				UpgradeType:    upgrades.ClusterUpgrade,
@@ -690,20 +704,6 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam
 		return errMasterUpdating
 	}
 
-	if err := disruption.RecordJUnit(
-		f,
-		"[sig-cluster-lifecycle] ClusterOperators are available and not degraded after upgrade",
-		func() (error, bool) {
-			if err := operator.WaitForOperatorsToSettle(context.TODO(), c, 5); err != nil {
-				return err, false
-			}
-			return nil, false
-		},
-	); err != nil {
-		recordClusterEvent(kubeClient, uid, "Upgrade", monitorapi.UpgradeFailedReason, fmt.Sprintf("failed to settle operators: %v", err), true)
-		return err
-	}
-
 	recordClusterEvent(kubeClient, uid, "Upgrade", monitorapi.UpgradeCompleteReason, fmt.Sprintf("version/%s image/%s", updated.Status.Desired.Version, updated.Status.Desired.Image), false)
 	return nil
 }