OPCT-428: make mco-sanitize COPY optional for arm64 - #91
Conversation
📝 WalkthroughSummary by CodeRabbit
WalkthroughThe tools image build now derives an architecture-specific Changesmco-sanitize build flow
Estimated code review effort: 2 (Simple) | ~10 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
86cf77d to
19855d1
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@tools/Containerfile`:
- Around line 57-60: Make the mco-sanitize download optional in
tools/Containerfile lines 57-60 by conditionally fetching and installing it only
when the architecture-specific URL is available, allowing the image build to
continue otherwise. Apply the same conditional handling to
artifacts-collector/Containerfile lines 39-43; both sites must permit runtime
fallback when the binary cannot be downloaded.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Enterprise
Run ID: 886af716-a486-4de3-a9bd-4c7b88fd39ea
📒 Files selected for processing (2)
artifacts-collector/Containerfiletools/Containerfile
19855d1 to
1205ba9
Compare
|
Below test shows now quay.io/opct/tools:v0.6.0 has mco-sanitize for amd64 and arm64 |
Move mco-sanitize URL construction to build.sh following the same pattern as oc, jq, camgi — build.sh handles arch mapping and passes the URL as a build arg to the Containerfile. - build.sh: construct mco-sanitize URL per architecture and pass as MCO_SANITIZE_URL build arg - tools/Containerfile: receive URL via ARG, download via ADD - artifacts-collector/Containerfile: COPY from tools image Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1205ba9 to
a11f660
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@tools/Containerfile`:
- Around line 57-59: Replace the unconditional ADD of MCO_SANITIZE_URL with a
curl-based download that tolerates missing or unavailable URLs, leaving
/usr/bin/mco-sanitize absent rather than creating an invalid or empty file. Keep
the chmod step conditional on a successfully downloaded executable so image
builds continue when mco-sanitize is unpublished.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Enterprise
Run ID: d1cfb82c-eef8-4e0b-b63d-f9f594fa143f
📒 Files selected for processing (2)
build.shtools/Containerfile
Verification: tools:v0.6.0 rebuilt with build.sh approachAll binaries present on both architectures: |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mtulio The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
6e6eb61
into
redhat-openshift-ecosystem:main
## Summary Rebase release-0.6 from main to include OPCT-428 fixes for v0.6.6 release. ### New commits since v0.6.5 - OPCT-428: add must-gather-clean to artifacts-collector (#88) - OPCT-428: add mco-sanitize to clean machineconfig secrets (#89) - OPCT-428: bump tools image to v0.6.0 + Fedora 42 (#90) - OPCT-428: make mco-sanitize COPY optional for arm64 (#91) Fixes: https://redhat.atlassian.net/browse/OPCT-403 Epic: https://redhat.atlassian.net/browse/OPCT-421 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Fix CI release-latest build failure on arm64. The tools:v0.6.0 arm64 image does not have mco-sanitize (not published for aarch64). Use wildcard glob so COPY succeeds silently on arm64. collector.sh already handles the missing binary with manual redaction fallback.
Fixes: https://github.com/redhat-openshift-ecosystem/provider-certification-plugins/actions/runs/29516430669