Skip to content

Commit be16a0a

Browse files
perdasilvaPer G. da Silvaclaude
authored
🌱 Align ClusterObjectSet e2e cleanup with addedResources pattern (#2799)
Track ClusterObjectSets in addedResources when applied, matching the pattern established for ClusterExtensions in #2783. This removes the special-case cleanup block in ScenarioCleanup and ensures multiple ClusterObjectSets per scenario are all cleaned up correctly. Co-authored-by: Per G. da Silva <pegoncal@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent dd78f2f commit be16a0a

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

test/e2e/steps/hooks.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ func ScenarioCleanup(ctx context.Context, _ *godog.Scenario, err error) (context
275275
}
276276

277277
forDeletion := sc.addedResources
278-
if sc.clusterObjectSetName != "" && featureGates[features.BoxcutterRuntime] {
279-
forDeletion = append(forDeletion, resource{name: sc.clusterObjectSetName, kind: "clusterobjectset"})
280-
}
281278
for _, catalogName := range sc.catalogs {
282279
forDeletion = append(forDeletion, resource{name: catalogName, kind: "clustercatalog"})
283280
}

test/e2e/steps/steps.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ func ResourceIsApplied(ctx context.Context, yamlTemplate *godog.DocString) error
523523
if res.GetKind() == "ClusterExtension" {
524524
sc.addedResources = append(sc.addedResources, resource{name: res.GetName(), kind: "clusterextension"})
525525
} else if res.GetKind() == "ClusterObjectSet" {
526-
sc.clusterObjectSetName = res.GetName()
526+
sc.clusterObjectSetName = res.GetName() // used for ${COS_NAME} variable substitution in YAML templates
527+
sc.addedResources = append(sc.addedResources, resource{name: res.GetName(), kind: "clusterobjectset"})
527528
} else {
528529
namespace := res.GetNamespace()
529530
if namespace == "" {

0 commit comments

Comments
 (0)