doozer: point reconciliation-PR upstream heuristic at quay-proxy.ci.registry.openshift.org - #3198
doozer: point reconciliation-PR upstream heuristic at quay-proxy.ci.registry.openshift.org#3198ashwindasr wants to merge 2 commits into
Conversation
…egistry.openshift.org resolve_upstream_from() fell back to the raw registry.ci.openshift.org host when computing the desired upstream FROM pullspec used by `images:streams prs open`. Point it at the quay-proxy mirror instead. Co-authored-by: Cursor <cursoragent@cursor.com> rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository: openshift-eng/coderabbit/.coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe upstream image resolver now returns member pullspecs through ChangesUpstream pullspec update
Estimated code review effort: 1 (Trivial) | ~5 minutes 🚥 Pre-merge checks | ✅ 10 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (10 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
…orkaround Co-authored-by: Cursor <cursoragent@cursor.com> rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
Summary
resolve_upstream_from()indoozer/doozerlib/cli/images_streams.pycomputes the desired upstreamFROMpullspec used bydoozer images:streams prs openwhen opening/updating reconciliation PRs against component repos. When an imagememberentry has no explicitcontent.source.ci_alignment.upstream_imageoverride, it fell back to a hardcoded heuristic pointing atregistry.ci.openshift.org. This switches that heuristic toquay-proxy.ci.registry.openshift.org, keeping the same/ocp/{major}.{minor}:{image_name}path structure.Scope is intentionally narrow:
resolve_upstream_from()is changed. Theimage_entry.streamand explicitci_alignment.upstream_imagebranches are driven by ocp-build-data config and are unaffected.ci_build_rootcoordinate parsing is host-agnostic (rspliton/and:) and needs no change.registry.ci.openshift.orgreferences elsewhere in the codebase (imagestream mirroring in this same file,build_sync.py,promote.py,get_nightlies.py,sync_ci_images.py,rhcos.py,distgit.py,rebaser.py, and the sharedREGISTRY_CI_OPENSHIFTconstant) are out of scope and untouched.Note: This is expected to be a temporary change. We may need to switch this heuristic back to
registry.ci.openshift.org(or another host) once the underlying registry migration this is working around is complete.Test plan
test_resolve_upstream_from_with_member_using_heuristicandtest_resolve_upstream_from_with_member_using_payload_nameindoozer/tests/cli/test_images_streams.pyto assert against the new host.uv run pytest --verbose --color=yes doozer/tests/cli/test_images_streams.py-- 28/28 passed.Summary by CodeRabbit
quay-proxy.ci.registry.openshift.orgregistry.