diff --git a/openshift/tests-extension/test/olmv1-incompatible.go b/openshift/tests-extension/test/olmv1-incompatible.go index cd8f565d4..d4ccb963c 100644 --- a/openshift/tests-extension/test/olmv1-incompatible.go +++ b/openshift/tests-extension/test/olmv1-incompatible.go @@ -9,7 +9,6 @@ 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" @@ -51,13 +50,6 @@ 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, "")