Skip to content

Remove VPC delete retry loop from e2e tests#115

Open
jmelis wants to merge 1 commit into
openshift-online:mainfrom
jmelis:jmelis/simplify-vpc-delete-retry
Open

Remove VPC delete retry loop from e2e tests#115
jmelis wants to merge 1 commit into
openshift-online:mainfrom
jmelis:jmelis/simplify-vpc-delete-retry

Conversation

@jmelis

@jmelis jmelis commented Jun 27, 2026

Copy link
Copy Markdown
Collaborator

Summary

The retry loop was needed because CloudFormation delete-stack would fail on the first attempt due to orphaned resources. With the CLI fix, the first attempt succeeds, so the retry is no longer needed. This saves ~15-20 minutes per CI run.

Test plan

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Tests
    • Simplified end-to-end cleanup verification for cluster VPC deletion.
    • The cleanup step now runs once and reports success or failure directly, making test behavior clearer and more predictable.

The CLI now pre-cleans orphaned ENIs and security groups before deleting
the CloudFormation stack (openshift-online/rosa-regional-platform-cli#TBD),
so the first attempt succeeds. The 3-attempt retry with 5-minute backoff
is no longer needed and was wasting ~15-20 minutes per CI run.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci

openshift-ci Bot commented Jun 27, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmelis

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 Jun 27, 2026
@coderabbitai

coderabbitai Bot commented Jun 27, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 9275c1cc-0062-45cc-a802-30e1de5ae6d4

📥 Commits

Reviewing files that changed from the base of the PR and between fb6b7b3 and c8fb992.

📒 Files selected for processing (1)
  • test/e2e-cli/cluster_test.go

Walkthrough

The vpc-delete cleanup spec in cluster_test.go is simplified: the previous logic that listed the VPC, checked existence, and retried deletion up to three times with 5-minute backoffs is replaced with a single rosactl cluster-vpc delete invocation that fails immediately on error.

VPC Delete Cleanup Simplification

Layer / File(s) Summary
Simplified vpc-delete spec
test/e2e-cli/cluster_test.go
Replaces the list/verify/retry-with-backoff loop with a single cluster-vpc delete call that fails immediately on error and logs success on completion.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 10 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Ai-Attribution ⚠️ Warning AI use is acknowledged, but the commit uses Co-Authored-By: Claude Opus 4.6 and has no Assisted-by/Generated-by trailer. Replace the AI co-author line with a Red Hat-style Assisted-by: or Generated-by: trailer (and keep human authorship if needed).
✅ 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 accurately summarizes the main change: removing the VPC delete retry loop from the e2e test.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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.
No-Weak-Crypto ✅ Passed The PR only changes the vpc-delete cleanup flow; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons were introduced.
Container-Privileges ✅ Passed No changed container/K8s manifest contains privileged settings; Dockerfile uses USER nonroot, and the only privileged hits are OpenAPI schema fields.
No-Sensitive-Data-In-Logs ✅ Passed The new vpc-delete logs only clusterName and generic command output on failure; no passwords, tokens, PII, or hostnames are logged.
No-Hardcoded-Secrets ✅ Passed No hardcoded secrets found in the changed vpc-delete cleanup code; it only uses env vars and command args.
No-Injection-Vectors ✅ Passed The changed vpc-delete block uses exec.Command with fixed args; no sql/shell/eval/yaml/pickle/dangerous-innerHTML patterns appear in the modified code.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown

PR needs rebase.

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.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant