Align push-to-stage PCC with per-OCP approach from multi-push-to-stage#20190
Open
crackcodecamp wants to merge 1 commit into
Open
Align push-to-stage PCC with per-OCP approach from multi-push-to-stage#20190crackcodecamp wants to merge 1 commit into
crackcodecamp wants to merge 1 commit into
Conversation
The single-branch push-to-stage workflow was generating PCC from a fixed
v4.17 operator index, which lacks 3.x entries (3.x only targets v4.19+).
This caused catalog overrides when pushing 2.x releases to overlapping
OCP versions — wiping shipped 3.x bundles and channels from the index.
Aligns with multi-push-to-stage.yaml by:
- Generating per-OCP PCC files from each version's actual production index
- Using catalog-{OCP_VERSION}.yaml instead of the single v4.17-based PCC
Signed-off-by: Akshay Ghodake <aghodake@redhat.com>
Contributor
Author
|
Hello @dchourasia, Whenever you get some time please help review these changes, Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The single-branch
push-to-stage.yamlworkflow generates PCC (Pre-Computed Catalog) from a fixed v4.17 operator index. Since RHOAI 3.x only targets v4.19+, the v4.17 index has no 3.x entries. When this workflow is used for a 2.x release (e.g., 2.25.5), the output catalog for overlapping OCP versions (v4.19–v4.21) is missing all 3.x bundles and channels — including already-shipped versions like 3.3.2.This caused the catalog override incident with 2.25.3/3.4EA1 where pushing 2.25.3 wiped 3.x entries from the production operator index.
Root Cause
push-to-stage.yamlline 191:CATALOG_GENERATION_REF_OCP_VERSION=v4.17 # Fixed — no 3.x entriesWhile
multi-push-to-stage.yamlalready generates per-OCP PCC from each version's actual index:opm migrate registry.redhat.io/redhat/redhat-operator-index:${OCP_VERSION}Changes
Three targeted changes to align
push-to-stage.yamlwith the workingmulti-push-to-stage.yaml:config/(needed for global OCP version list)config/config.yaml, identical tomulti-push-to-stage.yamllines 334–363catalog-${OPENSHIFT_VERSION}.yamlinstead ofcsv_meta_catalog.yaml/bundle_object_catalog.yamlLocal Test Results
Main test: 2.25.5 push for v4.19 (the override scenario)
Corner cases (all using NEW per-OCP PCC)
Multi-version same-day test (chained, simulating multi-push-to-stage)
Scope & Limitations
multi-push-to-stage.yamlwhich chains outputs — this fix does not add chaining topush-to-stage.yamlmulti-push-to-stage.yamlstage_promoter.pyor any other scriptWhen to use which workflow
push-to-stage.yaml(this PR)multi-push-to-stage.yamlTracker: https://redhat.atlassian.net/browse/RHOAIENG-59007