Skip to content

Comments

DPTP-4340: Remove direct mirroring to registry.ci.openshift.org, consolidate to single promotion step#4866

Open
deepsm007 wants to merge 2 commits intoopenshift:mainfrom
deepsm007:DPTP-4340
Open

DPTP-4340: Remove direct mirroring to registry.ci.openshift.org, consolidate to single promotion step#4866
deepsm007 wants to merge 2 commits intoopenshift:mainfrom
deepsm007:DPTP-4340

Conversation

@deepsm007
Copy link
Contributor

Removes the direct mirroring step to registry.ci.openshift.org and consolidates promotion into a single step that handles both quay.io mirroring and tagging.

The promotion now:
(1) mirrors to quay.io/openshift/ci using oc image mirror, then
(2) tags in registry.ci.openshift.org from quay-proxy.ci.openshift.org using oc tag.

/hold
/cc @Prucek @openshift/test-platform

@openshift-ci-robot
Copy link
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 5, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 5, 2025

@deepsm007: This pull request references DPTP-4340 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Removes the direct mirroring step to registry.ci.openshift.org and consolidates promotion into a single step that handles both quay.io mirroring and tagging.

The promotion now:
(1) mirrors to quay.io/openshift/ci using oc image mirror, then
(2) tags in registry.ci.openshift.org from quay-proxy.ci.openshift.org using oc tag.

/hold
/cc @Prucek @openshift/test-platform

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link

coderabbitai bot commented Dec 5, 2025

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

This pull request systematically removes "-quay" suffixes from promotion target naming conventions across the codebase. The changes update target name generation in the API layer, adjust classification logic in promotion steps, and align all tests and fixtures with the new naming scheme.

Changes

Cohort / File(s) Summary
Configuration & Defaults
pkg/defaults/defaults.go
Removed generic PromotionStep construction; promotion now uses quay-based step conditionally based on RegistryOverride setting.
API Layer
pkg/api/promotion.go, pkg/api/promotion_test.go
Removed "-quay" suffix from promotion target formatting; updated test expectations for proxy target keys (e.g., namespace/imagestream-name:tag instead of namespace/imagestream-name-quay:tag).
Promotion Step Logic
pkg/steps/release/promote.go, pkg/steps/release/promote_test.go
Changed target classification heuristic from checking "-quay:" suffix in key to checking for ${component} placeholder or quay-proxy.ci.openshift.org presence; updated test data and expected mappings to reflect simplified target names.
Test Fixtures
pkg/steps/release/testdata/zz_fixture_TestGetPromotionPod_promotion_quay.yaml, pkg/steps/release/testdata/zz_fixture_TestGetPromotionPod_promotion_quay_multiple_tags.yaml
Updated tagging loop target references from quay-suffixed variants to simplified names (e.g., ci/4.21:ovn-kubernetes instead of ci/4.21-quay:ovn-kubernetes); control flow and error handling remain unchanged.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot requested review from a team and Prucek December 5, 2025 17:00
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 5, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deepsm007

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 Dec 5, 2025
@deepsm007
Copy link
Contributor Author

/pipeline required

@openshift-ci-robot
Copy link
Contributor

Scheduling required tests:
/test e2e

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test integration-optional-test

@Prucek
Copy link
Member

Prucek commented Dec 12, 2025

when we merge this only the X.Y-quay IS will stay, is that what we want? Or do we want the current X.Y IS to use QCI images https://github.com/openshift/ci-tools/blob/main/pkg/api/promotion.go#L114

@deepsm007 deepsm007 force-pushed the DPTP-4340 branch 2 times, most recently from 8c8865e to 778e4f1 Compare February 6, 2026 14:40
@deepsm007
Copy link
Contributor Author

/test images

@openshift-ci-robot
Copy link
Contributor

Scheduling required tests:
/test e2e

@deepsm007 deepsm007 force-pushed the DPTP-4340 branch 3 times, most recently from d84c49f to 603fb8e Compare February 10, 2026 22:06
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 11, 2026

@deepsm007: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images 0c9127a link true /test images
ci/prow/breaking-changes 0c9127a link false /test breaking-changes

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.

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants