Skip to content

🌱 Align ClusterObjectSet e2e cleanup with addedResources pattern #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 8, 2026
Merged

🌱 Align ClusterObjectSet e2e cleanup with addedResources pattern #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions test/e2e/steps/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,6 @@ func ScenarioCleanup(ctx context.Context, _ *godog.Scenario, err error) (context
}

forDeletion := sc.addedResources
if sc.clusterObjectSetName != "" && featureGates[features.BoxcutterRuntime] {
forDeletion = append(forDeletion, resource{name: sc.clusterObjectSetName, kind: "clusterobjectset"})
}
for _, catalogName := range sc.catalogs {
forDeletion = append(forDeletion, resource{name: catalogName, kind: "clustercatalog"})
}
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/steps/steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@ func ResourceIsApplied(ctx context.Context, yamlTemplate *godog.DocString) error
if res.GetKind() == "ClusterExtension" {
sc.addedResources = append(sc.addedResources, resource{name: res.GetName(), kind: "clusterextension"})
} else if res.GetKind() == "ClusterObjectSet" {
sc.clusterObjectSetName = res.GetName()
sc.clusterObjectSetName = res.GetName() // used for ${COS_NAME} variable substitution in YAML templates
sc.addedResources = append(sc.addedResources, resource{name: res.GetName(), kind: "clusterobjectset"})

@pedjak pedjak Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick (non-blocking): clusterObjectSetName is still assigned here but cleanup has moved to addedResources. A short inline comment noting this field now only serves ${COS_NAME} substitution would help future readers understand why it is still set.

@perdasilva perdasilva Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated ^^

} else {
namespace := res.GetNamespace()
if namespace == "" {
Expand Down