Skip to content

doozer: point reconciliation-PR upstream heuristic at quay-proxy.ci.registry.openshift.org #3198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ashwindasr wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −4
Draft

doozer: point reconciliation-PR upstream heuristic at quay-proxy.ci.registry.openshift.org #3198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edb97ca
doozer: point reconciliation-PR upstream heuristic at quay-proxy.ci.r…
ashwindasr Jul 23, 2026
62b7a54
doozer: note that the quay-proxy heuristic is a temporary migration w…
ashwindasr Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions doozer/doozerlib/cli/images_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,8 +1466,10 @@ def resolve_upstream_from(runtime, image_entry):
# In release payloads, images are promoted into an imagestream
# tag name without the ose- prefix.
image_name = remove_prefix(image_name, 'ose-')
# e.g. registry.ci.openshift.org/ocp/4.6:base
return f'registry.ci.openshift.org/ocp/{major}.{minor}:{image_name}'
# e.g. quay-proxy.ci.registry.openshift.org/ocp/4.6:base
# TODO: temporary workaround for a registry.ci.openshift.org migration;
# revisit switching this back once the migration is complete.
return f'quay-proxy.ci.registry.openshift.org/ocp/{major}.{minor}:{image_name}'

if image_entry.image:
# CI is on its own. We can't give them an image that isn't available outside the firewall.
Expand Down
4 changes: 2 additions & 2 deletions doozer/tests/cli/test_images_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_resolve_upstream_from_with_member_using_heuristic(mocker, mock_runtime)
result = images_streams.resolve_upstream_from(mock_runtime, image_entry)

# Should strip 'ose-' prefix from image name
assert result == 'registry.ci.openshift.org/ocp/4.17:ansible'
assert result == 'quay-proxy.ci.registry.openshift.org/ocp/4.17:ansible'


def test_resolve_upstream_from_with_member_using_payload_name(mocker, mock_runtime):
Expand All @@ -135,7 +135,7 @@ def test_resolve_upstream_from_with_member_using_payload_name(mocker, mock_runti
result = images_streams.resolve_upstream_from(mock_runtime, image_entry)

# Should use payload_name and strip path
assert result == 'registry.ci.openshift.org/ocp/4.18:custom-payload-name'
assert result == 'quay-proxy.ci.registry.openshift.org/ocp/4.18:custom-payload-name'


def test_resolve_upstream_from_with_image_entry(mock_runtime):
Expand Down