Skip to content

fix(mce-must-gather): add OCP 5.0 mapping and fix unbound variable bug - #82667

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
mgencur:mce_must_gather_5.0
Jul 31, 2026
Merged

fix(mce-must-gather): add OCP 5.0 mapping and fix unbound variable bug#82667
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
mgencur:mce_must_gather_5.0

Conversation

@mgencur

@mgencur mgencur commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Fix OCP_VERSION_FOR_ACM typo causing unbound variable error and add missing OCP 5.0 → ACM 5.0 mapping with a fallback for unknown versions.

Summary by CodeRabbit

Updates MCE must-gather version detection to fix the OCP_VERSION_FOR_ACM variable typo, add OCP 5.0 → ACM 5.0 support, and default unknown OCP versions to ACM 2.17 with a warning.

Fix OCP_VERSION_FOR_ACM typo causing unbound variable error and add
missing OCP 5.0 → ACM 5.0 mapping with a fallback for unknown versions.
@coderabbitai

coderabbitai Bot commented Jul 30, 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: b1d6edb3-bfb9-4e51-b241-d7ddd7db3793

📥 Commits

Reviewing files that changed from the base of the PR and between f6962e5 and 73855a7.

📒 Files selected for processing (1)
  • ci-operator/step-registry/mce/must-gather/mce-must-gather-commands.sh

Walkthrough

The MCE must-gather script maps OCP 5.0 to ACM 5.0 and changes unmapped OCP-version handling to log the detected version and use ACM 2.17.

Changes

MCE must-gather version selection

Layer / File(s) Summary
Update ACM version resolution
ci-operator/step-registry/mce/must-gather/mce-must-gather-commands.sh
Adds the OCP 5.0-to-ACM 5.0 mapping and changes the unmapped-version fallback to ACM 2.17 with an updated warning.

Estimated code review effort: 2 (Simple) | ~5 minutes

Suggested reviewers: amp-rh

🚥 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 accurately reflects the main changes: adding OCP 5.0 mapping and fixing the unbound variable issue.
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 Only a shell script changed; no Ginkgo test titles were added or modified, so there are no unstable test names to flag.
Test Structure And Quality ✅ Passed Only a shell script changed; no Ginkgo tests were added or modified, so the test-quality check is not applicable.
Microshift Test Compatibility ✅ Passed Only a shell script changed; no Ginkgo tests or MicroShift-sensitive APIs/features were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only changes a must-gather shell script; no Ginkgo tests or SNO-relevant assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only a must-gather shell script changed; no manifests, controllers, or scheduling/topology constraints were added.
Ote Binary Stdout Contract ✅ Passed Only a ci-operator shell step changed; no OTE binary, TestMain, or suite-setup stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo e2e tests were added; only a must-gather shell script changed, so this check is not applicable.
No-Weak-Crypto ✅ Passed No weak crypto, custom crypto, or secret comparisons found in the changed script; only base64 encoding for registry auth.
Container-Privileges ✅ Passed Only version-mapping logic changed in a shell script; no privileged/K8s securityContext fields were added.
No-Sensitive-Data-In-Logs ✅ Passed No log statements added or changed here print secrets, tokens, PII, or hostnames; the new warning only mentions OCP_VERSION and ACM fallback.
✨ 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 requested review from etirta and shakyav July 30, 2026 11:44
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mgencur: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-origin-release-4.16-e2e-agent-connected-ovn-ipv4-metal3 openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.16-e2e-agent-connected-ovn-dualstack-metal3 openshift/origin presubmit Registry content changed
periodic-ci-openshift-hypershift-release-4.17-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-mce-e2e-agent-connected-ovn-dualstack-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.17-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-backuprestore N/A periodic Registry content changed
periodic-ci-stolostron-policy-collection-main-ocp5.0-interop-opp-vsphere N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.16-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-compact-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.18-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.16-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-compact-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-compact-conformance N/A periodic Registry content changed
periodic-ci-stolostron-policy-collection-main-ocp4.22-interop-opp-vsphere N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-mce-e2e-agent-connected-ovn-dualstack-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-mce-e2e-agent-critical N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.17-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-compact-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.17-periodics-mce-e2e-agent-connected-ovn-dualstack-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.18-periodics-mce-e2e-agent-critical N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.18-periodics-mce-e2e-agent-connected-ovn-dualstack-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.22-periodics-mce-e2e-agent-critical N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.21-periodics-mce-e2e-agent-connected-ovn-ipv4-metal-conformance N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.19-periodics-mce-e2e-agent-critical N/A periodic Registry content changed
periodic-ci-stolostron-acmqe-autotest-main-acm-ocp4.15-lp-interop-acm-interop-aws N/A periodic Registry content changed
periodic-ci-openshift-hypershift-release-4.20-periodics-mce-e2e-agent-connected-ovn-dualstack-metal-conformance N/A periodic Registry content changed

A total of 38 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@mgencur

mgencur commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

@dfrazzette @danalanerh @chaclark1974 @amp-rh @danalanerh Hello, could anyone please tag this? I extracted this from #81194 where I couldn't reach approvers. So, I'm pining a wider list now. Thanks

@etirta

etirta commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2026
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: etirta, mgencur

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 30, 2026
@mgencur

mgencur commented Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

This was previously tested in #81194

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@mgencur: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jul 31, 2026
@openshift-ci

openshift-ci Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

@mgencur: 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 656daef into openshift:main Jul 31, 2026
10 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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants