ci: add RHDH catalog index and chart version Gangway overrides#79538
ci: add RHDH catalog index and chart version Gangway overrides#79538zdrapela wants to merge 1 commit into
Conversation
Add Gangway API override support for catalog index image coordinates (CATALOG_INDEX_REGISTRY, CATALOG_INDEX_REPO, CATALOG_INDEX_TAG) and Helm chart version (CHART_VERSION) to all RHDH E2E test steps. This enables RC and GA verification via trigger-nightly-job.sh: --catalog-index-registry registry.access.redhat.com --catalog-index-repo rhdh/plugin-catalog-index --catalog-index-tag 1.9.4 --chart-version 1.9-227-CI Changes: - 7 helm commands.sh + 4 operator symlinks: add variable init, export, and override blocks for the 4 new MULTISTAGE_PARAM_OVERRIDE_* vars - 11 core ref.yaml: declare the 4 new env vars with defaults - data-router commands.sh: add new vars to OVERRIDE_VARS array (skips reporting on Gangway-triggered runs) - data-router ref.yaml: declare the 4 new env vars Companion PR: redhat-developer/rhdh (dynamic catalog index resolution from RELEASE_BRANCH_NAME with fallback defaults). Assisted-by: OpenCode
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: zdrapela The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
WalkthroughThis PR systematically adds configurable catalog index and chart version override support across the Red Hat Developer Helm and Operator nightly CI steps for multiple cloud platforms (AKS, EKS, GKE, OCP, OSD-GCP). Each shell script is extended to initialize, export, and conditionally override four new configuration variables based on Gangway API parameters. Corresponding CI step definitions are updated to declare these override parameters, and the data-router is updated to recognize them as override signals. ChangesCatalog Index and Chart Version Override Support Across CI Platforms
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 Trivy (0.69.3)Trivy execution timed out Comment |
|
[REHEARSALNOTIFIER]
A total of 64 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh (1)
1-56:⚠️ Potential issue | 🔴 CriticalUse
set -euo pipefailinstead of disabling error handling.This step registry script must use
set -euo pipefail(without-x) as the default shell options, per the step registry guidelines. Lines 2-3 currently disable error and unset variable handling withset +o errexitandset +o nounset, which contradicts the requirement:#!/bin/bash set -euo pipefail🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh` around lines 1 - 56, Replace the current disabled error/unset handling (the two lines "set +o errexit" and "set +o nounset") with a single strict-mode line "set -euo pipefail" at the top of the script; then audit any uses of potentially unset variables (e.g. elements in OVERRIDE_VARS, JOB_SPEC parsing, SHARED_DIR reads, DATA_ROUTER_* secret reads, and functions like save_status_data_router_failed and get_artifacts_url) and make them robust by providing safe defaults or explicit checks (use parameter expansion like ${VAR:-} or conditional guards) so the script still behaves correctly under strict mode.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In
`@ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh`:
- Around line 1-56: Replace the current disabled error/unset handling (the two
lines "set +o errexit" and "set +o nounset") with a single strict-mode line "set
-euo pipefail" at the top of the script; then audit any uses of potentially
unset variables (e.g. elements in OVERRIDE_VARS, JOB_SPEC parsing, SHARED_DIR
reads, DATA_ROUTER_* secret reads, and functions like
save_status_data_router_failed and get_artifacts_url) and make them robust by
providing safe defaults or explicit checks (use parameter expansion like
${VAR:-} or conditional guards) so the script still behaves correctly under
strict mode.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 14817316-9e09-44ec-8cb9-b6f14e39e168
📒 Files selected for processing (20)
ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/aks/operator/nightly/redhat-developer-rhdh-aks-operator-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/eks/operator/nightly/redhat-developer-rhdh-eks-operator-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/gke/operator/nightly/redhat-developer-rhdh-gke-operator-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-commands.shci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-ref.yamlci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/ocp/operator/nightly/redhat-developer-rhdh-ocp-operator-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-commands.shci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-ref.yamlci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.shci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-ref.yaml
1 participant
Summary
Add Gangway API override support for catalog index image coordinates and Helm chart version to all RHDH E2E test steps.
This enables RC and GA verification via
trigger-nightly-job.sh:Changes
commands.sh(+ 4 operator symlinks): Add variable init, export, and override blocks forCATALOG_INDEX_REGISTRY,CATALOG_INDEX_REPO,CATALOG_INDEX_TAG,CHART_VERSIONref.yaml: Declare 4 newMULTISTAGE_PARAM_OVERRIDE_*env varssend/data-routercommands.sh: Add new vars toOVERRIDE_VARSarray (skips reporting on Gangway-triggered runs)send/data-routerref.yaml: Declare the 4 new env varsCompanion PR
RHDH E2E Test Infrastructure: Gangway API Overrides for Catalog Index and Chart Version
This PR extends the OpenShift CI configuration for Red Hat Developer Hub (RHDH) nightly E2E test jobs to support overriding catalog index coordinates and Helm chart versions via the Gangway API.
Changes Made
Test Step Configuration Files (7 helm commands.sh + symlinked operator variants)
CATALOG_INDEX_REGISTRY(defaults to empty)CATALOG_INDEX_REPO(defaults to empty)CATALOG_INDEX_TAG(defaults to empty)CHART_VERSION(defaults to empty)MULTISTAGE_PARAM_OVERRIDE_*environment variables when provided, allowing dynamic overrides at job trigger time.Step Registry Manifests (11 ref.yaml files)
Data Router Infrastructure
send/data-router/commands.shto include the new override variables in theOVERRIDE_VARSarray, enabling the existing override detection logic to skip Data Router reporting when Gangway-triggered overrides are active.send/data-router/ref.yamlto declare the four new environment variables as available parameters.Practical Impact
The changes enable users running nightly RHDH E2E tests to override the plugin catalog index image coordinates (registry/repo/tag) and Helm chart version at job trigger time via Gangway, without requiring hardcoded defaults in the test infrastructure. This supports the companion feature in redhat-developer/rhdh#4860 for dynamic catalog index resolution with fallback defaults, allowing for more flexible testing across different catalog versions and container registries.