File tree Expand file tree Collapse file tree
openshift/tests-extension/test Expand file tree Collapse file tree Original file line number Diff line number Diff line change 99 . "github.com/onsi/gomega"
1010
1111 configv1 "github.com/openshift/api/config/v1"
12- "github.com/openshift/api/features"
1312 operatorv1 "github.com/openshift/api/operator/v1"
1413 "github.com/openshift/origin/test/extended/util/image"
1514 "sigs.k8s.io/controller-runtime/pkg/client"
@@ -51,13 +50,6 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation
5150 if ! env .Get ().IsOpenShift {
5251 Skip ("Requires OCP APIs: not OpenShift" )
5352 }
54- // TODO(OPRUN-4518): Re-enable once cluster-olm-operator is updated to read ClusterObjectSet
55- // instead of ClusterExtensionRevision. The upstream rename (operator-framework/operator-controller#2589)
56- // changed the CRD kind, but cluster-olm-operator still looks for ClusterExtensionRevision resources
57- // to detect incompatible operators via olm.maxOpenShiftVersion.
58- if helpers .IsFeatureGateEnabled (features .FeatureGateNewOLMBoxCutterRuntime ) {
59- Skip ("Skipping: cluster-olm-operator does not yet support ClusterObjectSet (renamed from ClusterExtensionRevision)" )
60- }
6153
6254 By ("waiting for InstalledOLMOperatorUpgradable to be true" )
6355 waitForOlmUpgradeStatus (ctx , operatorv1 .ConditionTrue , "" )
You can’t perform that action at this time.
0 commit comments