Skip to content

fix(rhdh-base-images): cap OpenShift RPM repos at released 4.y [main] - #143

Merged
nickboldt merged 3 commits into
mainfrom
fix/openshift-rpm-released-4y
Oct 14, 2026
Merged

nickboldt merged 3 commits into
mainfrom
fix/openshift-rpm-released-4y

Conversation

@nickboldt

Copy link
Copy Markdown
Member

Summary

  • Cap must-gather N-el9-beta RPM repo bumps at the latest released OpenShift 4.y from the product life cycle API (the versions behind https://access.redhat.com/support/policy/updates/openshift#dates). Today that is 4.22. Unreleased mirror directories such as 4.23-el9-beta and 5.1-el9-beta are left alone.
  • When weekly maintenance updates plugin-catalog builder.Containerfile, rewrite /rhocp/4.N/ to that same released version (/rhocp/4.21/ → /rhocp/4.22/). ocp-tools URLs are unchanged.
  • If the life cycle fetch fails, or no released 4.y directory is on the mirror, leave the existing URL in place.

Test plan

  • bash -n and shellcheck --severity=warning on base-images-and-rpms.sh
  • uv run ruff format and uv run ruff check on tests/unit/test_base_images_and_rpms.py
  • uv run pytest tests/unit/test_base_images_and_rpms.py (43 passed)
  • After merge, bump SKILL_SCRIPT_SHA in midstream build/ci/weekly-maintenance.sh so the next weekly run fetches this script. That pin is still 4e2960ff7c2d23eca3a4ef8c7ee7121c6fe7ca84.

https://redhat.atlassian.net/browse/RHIDP-17793

Generated-by: cursor

Must-gather N-el9-beta bumps and catalog builder /rhocp/4.N/ URLs stay on
the newest released 4.y from the OpenShift life cycle. Unreleased 4.23 and
5.1 streams are signed with a key UBI microdnf cannot verify.

https://redhat.atlassian.net/browse/RHIDP-17793

Generated-by: cursor
Co-authored-by: Cursor <cursoragent@cursor.com>
Comment thread skills/ci/rhdh-base-images/references/repos.md Outdated
Comment thread skills/ci/rhdh-base-images/references/repos.md Outdated
@nickboldt
nickboldt merged commit d7e61a0 into main Oct 14, 2026
5 checks passed
@nickboldt
nickboldt deleted the fix/openshift-rpm-released-4y branch October 14, 2026 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant