Skip to content

fix(rhdh-base-images): push catalog builder edits when header resolution fails [main] - #144

Merged
nickboldt merged 1 commit into
mainfrom
fix/catalog-builder-commit-on-header-failure
Oct 14, 2026
Merged

nickboldt merged 1 commit into
mainfrom
fix/catalog-builder-commit-on-header-failure

Conversation

@nickboldt

Copy link
Copy Markdown
Member

Summary

  • Job 63502349 pinned the catalog builder.Containerfile FROM on main, then returned when Node header resolution failed. The file stayed dirty, so checkout of release-2.1 aborted and weekly never opened a GitLab MR.
  • Commit and push builder.Containerfile on that failure path (and when the file has no ubi nodejs FROM). commit_push_paths lands it on chore/automated-update-rpm-lockfile/<branch>, which weekly already turns into a GitLab MR when HEAD is chore/*.

Test plan

  • bash -n and shellcheck --severity=warning on base-images-and-rpms.sh
  • 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. The failing job still fetched 4e2960ff7c2d23eca3a4ef8c7ee7121c6fe7ca84.

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

Generated-by: cursor

…ion fails

A FROM or rhocp rewrite of builder.Containerfile was left uncommitted when
Node headers could not be resolved. The next branch checkout then aborted,
and weekly never opened a GitLab MR.

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

Generated-by: cursor
Co-authored-by: Cursor <cursoragent@cursor.com>
@nickboldt
nickboldt merged commit c8f2fa7 into main Oct 14, 2026
5 checks passed
@nickboldt
nickboldt deleted the fix/catalog-builder-commit-on-header-failure branch October 14, 2026 12:44
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