[release-1.10] fix(ci): dynamically resolve catalog index image from branch + remove trigger-nightly-job command#4910
Open
zdrapela wants to merge 4 commits into
Conversation
Replace hardcoded quay.io/rhdh/plugin-catalog-index:1.10 with a single
branch-aware CATALOG_INDEX_IMAGE variable derived from RELEASE_BRANCH_NAME.
Add RELEASE_VERSION canonical variable (release-1.10 → 1.10,
main → next) to env_variables.sh for reuse across CI scripts.
Changes:
- env_variables.sh: Add RELEASE_VERSION + CATALOG_INDEX_IMAGE variable
- 5 operator Backstage CRs: Use $CATALOG_INDEX_IMAGE via envsubst
- lib/helm.sh: Parse CATALOG_INDEX_IMAGE into registry/repository/tag
for --set global.catalogIndex.image.{registry,repository,tag}
- operator.sh: Simplify version derivation using RELEASE_VERSION
- trigger-nightly-job.sh: Add --catalog-index-image and --chart-version
Gangway override flags for RC/GA verification
Companion PR required in openshift/release to add
MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE env var to step registry
ref.yaml + commands.sh files. The rhdh changes include fallback defaults
so order of merge does not matter.
Assisted-by: Claude Code
Replace the full trigger-nightly-job agent command with a stub that points users to the installable skill at redhat-developer/rhdh-skills/skills/prow-trigger-nightly. The underlying script (.ci/pipelines/trigger-nightly-job.sh) remains in this repository. Assisted-by: Claude Code
…lm deployments - Only inject CATALOG_INDEX_IMAGE in Helm chart and Operator when specified - Use yq to dynamically inject env var into Backstage CRs rather than relying on sed - Removed hardcoded CATALOG_INDEX_IMAGE from yaml templates Assisted-by: OpenCode
Code Review by Qodo
Context used✅ Tickets:
RHIDP-14348 1. Wrong nightly flag examples
|
zdrapela
changed the title
Member
Author
|
/test e2e-ocp-helm-nightly e2e-ocp-operator-nightly e2e-eks-helm-nightly |
Contributor
|
The container image build workflow finished with status: |
|
Review Summary by QodoDynamically resolve catalog index image and add Gangway override support
WalkthroughsDescription• Dynamically resolve catalog index image from branch via RELEASE_VERSION variable - Replaces hardcoded quay.io/rhdh/plugin-catalog-index:1.10 with branch-aware reference - Supports RC and GA verification via Gangway overrides • Add catalog index and chart version override support to trigger-nightly-job script - New flags: --catalog-index-image and --chart-version for CI job customization - Enhanced documentation with RC/GA verification examples • Simplify operator version derivation using canonical RELEASE_VERSION variable - Removes duplicate version extraction logic across scripts • Replace trigger-nightly-job command documentation with external skill reference - Points users to installable prow-trigger-nightly skill in rhdh-skills repository Diagramflowchart LR
A["RELEASE_BRANCH_NAME<br/>release-1.10 or main"] -->|derive| B["RELEASE_VERSION<br/>1.10 or next"]
B -->|used by| C["env_variables.sh"]
C -->|provides| D["CATALOG_INDEX_IMAGE<br/>registry/repo:tag"]
D -->|injected into| E["Operator Backstage CRs<br/>via yq"]
D -->|parsed into| F["Helm chart parameters<br/>registry/repo/tag"]
G["trigger-nightly-job.sh"] -->|accepts| H["--catalog-index-image<br/>--chart-version flags"]
H -->|passes to| I["ProwJob via Gangway<br/>MULTISTAGE_PARAM_OVERRIDE"]
File Changes1. .ci/pipelines/env_variables.sh
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release-1.10 #4910 +/- ##
=================================================
+ Coverage 41.03% 69.60% +28.57%
=================================================
Files 121 111 -10
Lines 2220 4702 +2482
Branches 539 537 -2
=================================================
+ Hits 911 3273 +2362
- Misses 1304 1428 +124
+ Partials 5 1 -4
Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
Member
Author
|
/test e2e-eks-helm-nightly |
Member
Author
|
/test e2e-aks-helm-nightly |
|
@zdrapela: The following tests 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. |
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
1 participant
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.
Jira: https://redhat.atlassian.net/browse/RHIDP-14348
Cherry-pick of #4860 to
release-1.10branch.Summary
Dynamically resolve the catalog index image from
RELEASE_BRANCH_NAMEinstead of hardcoding it, and add Gangway API override support for catalog index and chart version.Also replaces the
trigger-nightly-jobagent command with an install guide pointing to the external skill.