diff --git a/test/e2e/object-controller/features/cos_object_collision_and_adoption.feature b/test/e2e/object-controller/features/cos_object_collision_and_adoption.feature index 215d6bf26c..c15c72e879 100644 --- a/test/e2e/object-controller/features/cos_object_collision_and_adoption.feature +++ b/test/e2e/object-controller/features/cos_object_collision_and_adoption.feature @@ -1,4 +1,4 @@ -@BoxcutterRuntime +@ObjectController @ClusterObjectSet Feature: ClusterObjectSet object collision and adoption As an OLM user applying a ClusterObjectSet directly, I want the revision's @@ -7,7 +7,7 @@ Feature: ClusterObjectSet object collision and adoption choose how aggressively a revision takes ownership of pre-existing objects. Background: - Given OLM is available + Given object-controller is available # --------------------------------------------------------------------------- # Collisions: the revision refuses to take ownership (Ready=False/ObjectCollision) diff --git a/test/e2e/object-controller/features/cos_preflight.feature b/test/e2e/object-controller/features/cos_preflight.feature index 1786de7737..c30b780e53 100644 --- a/test/e2e/object-controller/features/cos_preflight.feature +++ b/test/e2e/object-controller/features/cos_preflight.feature @@ -1,4 +1,4 @@ -@BoxcutterRuntime +@ObjectController @ClusterObjectSet Feature: ClusterObjectSet preflight dry-run validation As an OLM user applying a ClusterObjectSet directly, I want the revision to be @@ -8,7 +8,7 @@ Feature: ClusterObjectSet preflight dry-run validation require re-creating the revision. Background: - Given OLM is available + Given object-controller is available Scenario: ClusterObjectSet reports PreconditionsNotMet when an object targets a non-existent namespace When ClusterObjectSet is applied diff --git a/test/e2e/object-controller/features/cos_revision_identity.feature b/test/e2e/object-controller/features/cos_revision_identity.feature index 346d9c7da8..c633c6fa58 100644 --- a/test/e2e/object-controller/features/cos_revision_identity.feature +++ b/test/e2e/object-controller/features/cos_revision_identity.feature @@ -1,4 +1,4 @@ -@BoxcutterRuntime +@ObjectController @ClusterObjectSet Feature: Validate ClusterObjectSet revision identity A ClusterObjectSet's name must be -, with the revision in @@ -6,7 +6,7 @@ Feature: Validate ClusterObjectSet revision identity prevent duplicate revision numbers within a group, regardless of ownership. Background: - Given OLM is available + Given object-controller is available Scenario Outline: Reject a ClusterObjectSet name with When resource apply fails with error msg containing "metadata.name must be -" diff --git a/test/e2e/object-controller/features/cos_static_validation.feature b/test/e2e/object-controller/features/cos_static_validation.feature index ae6caafd30..7cead7258c 100644 --- a/test/e2e/object-controller/features/cos_static_validation.feature +++ b/test/e2e/object-controller/features/cos_static_validation.feature @@ -1,4 +1,4 @@ -@BoxcutterRuntime +@ObjectController @ClusterObjectSet Feature: ClusterObjectSet static preflight validation As an OLM user applying a ClusterObjectSet directly, I want the revision to be @@ -7,7 +7,7 @@ Feature: ClusterObjectSet static preflight validation instead of being silently accepted. Background: - Given OLM is available + Given object-controller is available Scenario: ClusterObjectSet reports PreconditionsNotMet when the same object appears in multiple phases Given namespace "${TEST_NAMESPACE}" is available diff --git a/test/e2e/object-controller/features/group.feature b/test/e2e/object-controller/features/group.feature index efb7a95ffe..51c31efa34 100644 --- a/test/e2e/object-controller/features/group.feature +++ b/test/e2e/object-controller/features/group.feature @@ -1,4 +1,3 @@ -@BoxcutterRuntime Feature: Track ClusterObjectSet revisions by group As a ClusterObjectSet user, I want to group successive revisions so that a new @@ -9,10 +8,10 @@ Feature: Track ClusterObjectSet revisions by group should leave other groups' revisions untouched. Background: - Given OLM is available - And an image registry is available + Given object-controller is available And namespace "${TEST_NAMESPACE}" is available + @ObjectController @ClusterObjectSet Scenario Outline: Group handoff preserves objects when Both ClusterObjectSets have the same group. Their controller owner references point to different Namespaces, or one or both ClusterObjectSets have no owner @@ -99,6 +98,7 @@ Feature: Track ClusterObjectSet revisions by group | an ownerless revision is followed by an owned revision | | ${TEST_NAMESPACE} | | both revisions have no controller owner | | | + @ObjectController @ClusterObjectSet Scenario: Different groups collide even with the same controller owner Given ClusterObjectSet with Namespace owner "${TEST_NAMESPACE}" is applied """ @@ -167,8 +167,11 @@ Feature: Track ClusterObjectSet revisions by group lifecycleState: Active """ + @BoxcutterRuntime Scenario: Revision pruning is isolated by group - Given a catalog "test" with packages: + Given OLM is available + And an image registry is available + And a catalog "test" with packages: | package | version | channel | replaces | contents | | test | 1.0.0 | beta | | CRD, Deployment, ConfigMap | | test | 1.0.1 | beta | 1.0.0 | CRD, Deployment, ConfigMap | diff --git a/test/e2e/object-controller/features/revision.feature b/test/e2e/object-controller/features/revision.feature index 5c0c086892..dcdbfaf709 100644 --- a/test/e2e/object-controller/features/revision.feature +++ b/test/e2e/object-controller/features/revision.feature @@ -1,10 +1,10 @@ -@BoxcutterRuntime +@ObjectController @ClusterObjectSet Feature: Install ClusterObjectSet As an OLM user I would like to install a ClusterObjectSet directly, without using the cluster extension API. Background: - Given OLM is available + Given object-controller is available Scenario: Probe failure for PersistentVolumeClaim halts phase progression Given ServiceAccount "pvc-probe-sa" with needed permissions is available in test namespace