Skip to content

🐛 e2e: skip clusterobjectset cleanup when BoxcutterRuntime is disabled#2662

Merged
openshift-merge-bot[bot] merged 1 commit intooperator-framework:mainfrom
joelanford:fix-cos-cleanup-error
Apr 20, 2026
Merged

🐛 e2e: skip clusterobjectset cleanup when BoxcutterRuntime is disabled#2662
openshift-merge-bot[bot] merged 1 commit intooperator-framework:mainfrom
joelanford:fix-cos-cleanup-error

Conversation

@joelanford
Copy link
Copy Markdown
Member

@joelanford joelanford commented Apr 18, 2026

Description

Scenario cleanup unconditionally attempted to delete the pre-generated clusterobjectset resource, but the CRD only exists when BoxcutterRuntime is enabled. This produced the error:

error: the server doesn't have a resource type "clusterobjectset"

Guard the deletion with a featureGates[features.BoxcutterRuntime] check so it's only attempted when the CRD exists.

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

Copilot AI review requested due to automatic review settings April 18, 2026 11:01
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 18, 2026

Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 25dfc4e
🔍 Latest deploy log https://app.netlify.com/projects/olmv1/deploys/69e373721f0b4c000880dc7f
😎 Deploy Preview https://deploy-preview-2662--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adjusts e2e scenario context initialization to avoid attempting ClusterObjectSet cleanup in suites where the CRD isn’t present (preventing noisy cleanup failures).

Changes:

  • Stop pre-populating clusterObjectSetName in CreateScenarioContext, so cleanup only tries deleting a ClusterObjectSet when one was actually applied.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread test/e2e/steps/hooks.go
Scenario cleanup unconditionally attempted to delete the pre-generated
clusterobjectset resource, but the CRD only exists when BoxcutterRuntime
is enabled. Guard the deletion with a feature gate check.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@joelanford joelanford force-pushed the fix-cos-cleanup-error branch from fb9f3e6 to 25dfc4e Compare April 18, 2026 12:05
@joelanford joelanford changed the title 🐛 e2e: don't pre-populate clusterObjectSetName in scenario context 🐛 e2e: skip clusterobjectset cleanup when BoxcutterRuntime is disabled Apr 18, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 18, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 68.93%. Comparing base (2b2669f) to head (25dfc4e).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2662      +/-   ##
==========================================
+ Coverage   68.89%   68.93%   +0.03%     
==========================================
  Files         141      141              
  Lines       10009    10009              
==========================================
+ Hits         6896     6900       +4     
+ Misses       2596     2594       -2     
+ Partials      517      515       -2     
Flag Coverage Δ
e2e 37.37% <ø> (+0.23%) ⬆️
experimental-e2e 52.53% <ø> (+0.02%) ⬆️
unit 53.68% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Apr 20, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2026
@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Apr 20, 2026

I had been seeing these messages, too.
/approve

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit e45ca46 into operator-framework:main Apr 20, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants