fix(ci): derive catalog index image dynamically from branch#5122
fix(ci): derive catalog index image dynamically from branch#5122jonkoops wants to merge 3 commits into
Conversation
Populate CATALOG_INDEX_IMAGE with a default based on RELEASE_VERSION so CI always uses the correct catalog index without hardcoding. Remove the stale catalogIndex blocks from the Helm values files — the --set flags from helm::get_image_params() now always take effect and override anything in the values file anyway. Refs: RHIDP-14348 Signed-off-by: Jon Koops <jonkoops@gmail.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5122 +/- ##
==========================================
- Coverage 63.69% 59.96% -3.74%
==========================================
Files 123 111 -12
Lines 2424 2198 -226
Branches 577 546 -31
==========================================
- Hits 1544 1318 -226
Misses 879 879
Partials 1 1
Continue to review full report in Codecov by Harness.
🚀 New features to boost your workflow:
|
nickboldt
left a comment
nickboldt
left a comment
There was a problem hiding this comment.
works for me, as we'll always have a :x.y tag even if :next and :latest float around
|
/retest |
|
/lgtm |
|
New changes are detected. LGTM label has been removed. |
|
|
@jonkoops: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
@nickboldt please don't sync the branch with |
4 participants
PR #4860 (RHIDP-14348) added
RELEASE_VERSIONandCATALOG_INDEX_IMAGEinfrastructure toenv_variables.shwith the stated goal of replacing the hardcoded catalog index tag — but left the default empty and the values file blocks in place as a fallback while the companionopenshift/releasePR (openshift/release#79538) was validated. That companion PR has since been merged, andRELEASE_BRANCH_NAMEis reliably set in all Prow steps. However the final step of populating the default and removing the stale fallback was never completed.This PR finishes that work:
CATALOG_INDEX_IMAGEnow defaults toquay.io/rhdh/plugin-catalog-index:${RELEASE_VERSION}, giving usmain→:next,release-1.10→:1.10automatically. The hardcodedcatalogIndexblocks invalues_showcase.yamlandvalues_showcase-rbac.yamlare removed sincehelm::get_image_params()always injects the--setflags now, which take precedence over values file content regardless.Gangway overrides for RC/GA verification continue to work — an explicit
CATALOG_INDEX_IMAGEprovided externally takes precedence over the default.Blocked: #5113
Refs: RHIDP-14348