UPSTREAM: <carry>: Skip incompatible operator test when Boxcutter uses ClusterObjectSet

The upstream rename of ClusterExtensionRevision to ClusterObjectSet
(operator-framework/operator-controller#2589) breaks the incompatible
operator detection in cluster-olm-operator. The cluster-olm-operator
binary still reads ClusterExtensionRevision resources to find operators
with olm.maxOpenShiftVersion, so after the rename it never detects
incompatible operators and InstalledOLMOperatorsUpgradeable stays True.

Skip this test when NewOLMBoxCutterRuntime feature gate is enabled
until cluster-olm-operator is updated to read ClusterObjectSet.

Signed-off-by: Camila Macedo <cmacedo@redhat.com>
Made-with: Cursor

Author: camilamacedo86

openshift/tests-extension/test/olmv1-incompatible.go

@@ -9,6 +9,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/api/features"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	"github.com/openshift/origin/test/extended/util/image"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -50,6 +51,13 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation
 			if !env.Get().IsOpenShift {
 				Skip("Requires OCP APIs: not OpenShift")
 			}
+			// TODO(OPRUN-4518): Re-enable once cluster-olm-operator is updated to read ClusterObjectSet
+			// instead of ClusterExtensionRevision. The upstream rename (operator-framework/operator-controller#2589)
+			// changed the CRD kind, but cluster-olm-operator still looks for ClusterExtensionRevision resources
+			// to detect incompatible operators via olm.maxOpenShiftVersion.
+			if helpers.IsFeatureGateEnabled(features.FeatureGateNewOLMBoxCutterRuntime) {
+				Skip("Skipping: cluster-olm-operator does not yet support ClusterObjectSet (renamed from ClusterExtensionRevision)")
+			}
 
 			By("waiting for InstalledOLMOperatorUpgradable to be true")
 			waitForOlmUpgradeStatus(ctx, operatorv1.ConditionTrue, "")