Skip to content

AGENT-1517: fix iri deletion test - #6070

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
andfasano:fix-iri-delete-test
May 20, 2026
Merged

AGENT-1517: fix iri deletion test#6070
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
andfasano:fix-iri-delete-test

Conversation

@andfasano

@andfasano andfasano commented May 20, 2026

Copy link
Copy Markdown
Contributor

- What I did
This patch contains a small fix to run the IRI deletion test

Summary by CodeRabbit

  • Tests
    • Improved IRI deletion test reliability by implementing retry logic for cleanup operations, addressing potential timing issues during resource deletion processes.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 20, 2026
@openshift-ci-robot

openshift-ci-robot commented May 20, 2026

Copy link
Copy Markdown
Contributor

@andfasano: This pull request references AGENT-1517 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

- What I did
This patch contains a small fix to run the IRI deletion test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented May 20, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: c9deb40d-5d91-40fd-b07b-c4ce9f1ed63b

📥 Commits

Reviewing files that changed from the base of the PR and between f9bc3c8 and e8bd3e0.

📒 Files selected for processing (1)
  • test/e2e-iri/iri_delete_test.go

Walkthrough

The test for IRI (InternalReleaseImage) deletion is enhanced to use retry polling instead of single-shot delete calls. It now deletes the VAP binding with NotFound tolerance, then polls until the IRI deletion succeeds, accounting for operator behavior that may recreate the binding during cleanup. Post-deletion assertions remain unchanged.

Changes

IRI Deletion Test Robustness

Layer / File(s) Summary
Add retry polling for VAP binding and IRI deletion
test/e2e-iri/iri_delete_test.go
The test replaces single-shot delete calls with wait.PollUntilContextTimeout retry logic. It first deletes the VAP binding (ignoring NotFound), then polls the IRI deletion until success, handling cases where the operator recreates the binding during the deletion sequence. Subsequent assertions for garbage collection, MachineConfig state, and registry port availability are unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

  • openshift/machine-config-operator#6041: The main PR's test/e2e-iri/iri_delete_test.go changes (removing the VAP binding and polling/retrying until the IRI is fully garbage-collected while asserting the master MachineConfig's iri-registry.service is disabled) directly validate the controller behavior introduced in #6041 ("disable and remove finalizer" path instead of cascade delete).

Suggested reviewers

  • bfournie
  • rwsu
🚥 Pre-merge checks | ✅ 10 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Test Structure And Quality ⚠️ Warning Test has assertion message gaps and lacks meaningful failure diagnostics on line 70 with require.NoError(t, err) having no message, violating quality requirement #4. Add descriptive failure message to line 70 assertion: require.NoError(t, err, "failed to parse and convert master MC config")
✅ Passed checks (10 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: fixing the IRI deletion test with a specific issue reference (AGENT-1517).
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed This test suite uses standard Go testing, not Ginkgo. The only test function TestIRIController_IRIDelete has a static, deterministic name with no dynamic values.
Microshift Test Compatibility ✅ Passed PR modifies existing test only; custom check applies only to NEW Ginkgo e2e tests. No new test functions (It/Describe/Context/When) are added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Test doesn't assume multiple nodes (selects any available master node) and is guarded by skipIfNoBaremetal() which prevents running on non-baremetal SNO platforms.
Topology-Aware Scheduling Compatibility ✅ Passed PR only modifies test code (test/e2e-iri/iri_delete_test.go), not deployment manifests, operator code, or controllers. Topology-aware scheduling check does not apply to test-only changes.
Ote Binary Stdout Contract ✅ Passed No non-JSON stdout writes found at process level. All logging uses t.Logf() within test functions, and TestMain correctly redirects stderr. No violations of OTE Binary Stdout Contract detected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The modified test contains no IPv4-specific assumptions, hardcoded IPv4 addresses, or external connectivity requirements. It uses cluster-internal APIs and IPv6-compatible socket checking commands.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Command failed


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
openshift-ci Bot requested review from pawanpinjarkar and zaneb May 20, 2026 12:28
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2026
@bfournie

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

@openshift-ci

openshift-ci Bot commented May 20, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andfasano, bfournie

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

@andfasano

Copy link
Copy Markdown
Contributor Author

/verified by @andfasano

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 20, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@andfasano: This PR has been marked as verified by @andfasano.

Details

In response to this:

/verified by @andfasano

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD f9bc3c8 and 2 for PR HEAD e8bd3e0 in total

@andfasano

Copy link
Copy Markdown
Contributor Author

/test e2e-aws-ovn

@openshift-ci

openshift-ci Bot commented May 20, 2026

Copy link
Copy Markdown
Contributor

@andfasano: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 18f2450 into openshift:main May 20, 2026
16 of 17 checks passed
openshift-merge-bot Bot added a commit that referenced this pull request May 25, 2026
openshift-merge-bot Bot added a commit that referenced this pull request Jul 30, 2026
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants