Skip to content

USHIFT-7349: tolerate podman image cleanup failures in cleanup-composer.sh#7054

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pacevedom:USHIFT-7349
Jul 15, 2026
Merged

USHIFT-7349: tolerate podman image cleanup failures in cleanup-composer.sh#7054
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pacevedom:USHIFT-7349

Conversation

@pacevedom

@pacevedom pacevedom commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

A stuck container that won't stop within the podman timeout causes podman rmi -af to fail, which with set -e kills the entire iso-build step even when all builds actually succeeded.

Summary by CodeRabbit

  • Bug Fixes
    • Improved development environment cleanup reliability by allowing container image removal to continue when no removable images are found or a removal command returns an error.

A stuck container that won't stop within the podman timeout causes
`podman rmi -af` to fail, which with `set -e` kills the entire
iso-build step even when all builds actually succeeded.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 15, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@pacevedom: This pull request explicitly references no jira issue.

Details

In response to this:

A stuck container that won't stop within the podman timeout causes podman rmi -af to fail, which with set -e kills the entire iso-build step even when all builds actually succeeded.

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 Jul 15, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 2ec929b5-b119-4278-99ff-6282e467af71

📥 Commits

Reviewing files that changed from the base of the PR and between d4dd1f2 and b849370.

📒 Files selected for processing (1)
  • scripts/devenv-builder/cleanup-composer.sh

Walkthrough

The full-clean Composer cleanup script now treats failures from both sudo and non-sudo Podman image removal commands as non-fatal.

Changes

Podman cleanup behavior

Layer / File(s) Summary
Tolerate Podman removal failures
scripts/devenv-builder/cleanup-composer.sh
Both podman rmi -af commands now continue after non-zero exit statuses.

Estimated code review effort: 1 (Trivial) | ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main change: making podman image cleanup failures non-fatal in cleanup-composer.sh.
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.
Stable And Deterministic Test Names ✅ Passed PR only changes a shell cleanup script; no Ginkgo tests or test titles were added or modified.
Test Structure And Quality ✅ Passed Only a shell cleanup script changed; no Ginkgo tests were added or modified, so the test-quality check is not applicable.
Microshift Test Compatibility ✅ Passed This PR only relaxes podman image cleanup in a shell script; it adds no Ginkgo tests or MicroShift-relevant API usage.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only scripts/devenv-builder/cleanup-composer.sh changed; no new Ginkgo tests or SNO-sensitive assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only scripts/devenv-builder/cleanup-composer.sh changed; it’s a cleanup shell script, not a manifest/controller/scheduling change.
Ote Binary Stdout Contract ✅ Passed PR only changes a cleanup shell script to ignore podman rmi failures; no OTE binary process-level stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only cleanup-composer.sh changed; no new Ginkgo tests or IP/network logic were added.
No-Weak-Crypto ✅ Passed The PR only makes podman image removal non-fatal in a shell cleanup script; no weak crypto, custom crypto, or secret comparisons are present.
Container-Privileges ✅ Passed Only scripts/devenv-builder/cleanup-composer.sh changed; no container/K8s manifests or privilege settings were added.
No-Sensitive-Data-In-Logs ✅ Passed The diff only adds || true to podman rmi -af; it introduces no new log output or sensitive-data exposure.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@pmtk

pmtk commented Jul 15, 2026

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci
openshift-ci Bot requested review from ggiguash and kasturinarra July 15, 2026 12:19
@openshift-ci

openshift-ci Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, pmtk

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 Jul 15, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2026
@openshift-ci

openshift-ci Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

@pacevedom: 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.

@ggiguash

Copy link
Copy Markdown
Contributor

/verified by ci

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

Copy link
Copy Markdown

@ggiguash: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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
openshift-merge-bot Bot merged commit b70eaa2 into openshift:main Jul 15, 2026
13 checks passed
@pacevedom pacevedom changed the title NO-ISSUE: tolerate podman image cleanup failures in cleanup-composer.sh USHIFT-7349: tolerate podman image cleanup failures in cleanup-composer.sh Jul 15, 2026
@pacevedom

Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown

@pacevedom: new pull request created: #7055

Details

In response to this:

/cherry-pick release-4.22

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.

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.

5 participants