Skip to content

feat(rhdh): align disconnected CATALOG_INDEX_IMAGE as single Gangway override#81128

Open
zdrapela wants to merge 1 commit into
openshift:mainfrom
zdrapela:rhdh-disconnected-catalog-index-fix
Open

feat(rhdh): align disconnected CATALOG_INDEX_IMAGE as single Gangway override#81128
zdrapela wants to merge 1 commit into
openshift:mainfrom
zdrapela:rhdh-disconnected-catalog-index-fix

Conversation

@zdrapela

@zdrapela zdrapela commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Replace three separate CATALOG_INDEX_REGISTRY/REPO/TAG Gangway override parameters with a single CATALOG_INDEX_IMAGE parameter, matching the pattern used by the connected helm/operator jobs.

The rhdh repo's env_variables.sh handles splitting CATALOG_INDEX_IMAGE into registry/repo/tag components. Using the single-variable approach fixes the CI build verification flow where CATALOG_INDEX_IMAGE was never constructed from the three components and the handler's if-blocks never triggered.

Changes

  • commands.sh: export CATALOG_INDEX_IMAGE instead of 3 separate vars
  • helm ref.yaml: single MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
  • operator ref.yaml: same (commands.sh is a symlink to helm's)

Companion PR

redhat-developer/rhdh#5008

Summary by CodeRabbit

This change updates the disconnected RHDH Gangway CI configuration to pass the catalog index as a single CATALOG_INDEX_IMAGE value instead of splitting it into registry, repo, and tag parts.

Practically, this aligns the disconnected Helm and operator jobs with the connected-job pattern, so the CI environment now handles the catalog index image consistently and avoids the build verification issue caused by the old three-part override flow not triggering the expected env handling logic.

…override

Replace three separate CATALOG_INDEX_REGISTRY/REPO/TAG Gangway override
parameters with a single CATALOG_INDEX_IMAGE parameter, matching the
pattern used by the connected helm/operator jobs.

The rhdh repo's env_variables.sh handles splitting CATALOG_INDEX_IMAGE
into registry/repo/tag components. Using the single-variable approach
fixes the CI build verification flow where CATALOG_INDEX_IMAGE was
never constructed from the three components and the handler's
if-blocks never triggered.

Changes:
- commands.sh: export CATALOG_INDEX_IMAGE instead of 3 separate vars
- helm ref.yaml: single MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
- operator ref.yaml: same (commands.sh is a symlink to helm's)

Assisted-by: OpenCode
@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 729b3d7a-dd37-4537-8d27-c414047064a1

📥 Commits

Reviewing files that changed from the base of the PR and between 382c6a3 and 2396b90.

📒 Files selected for processing (3)
  • ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
  • ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml
  • ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml

Walkthrough

The PR replaces separate catalog index registry/repo/tag override parameters with a single catalog index image override in the nightly disconnected Helm and operator step references, and updates the shell script to export and consume CATALOG_INDEX_IMAGE.

Changes

Catalog index image override

Layer / File(s) Summary
Override contract
ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml, ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml
MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE replaces the registry/repo/tag override variables, and the documentation now describes a full image reference.
Shell script wiring
ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
CATALOG_INDEX_IMAGE is initialized, exported, and set from the single catalog index override input.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested labels

lgtm, approved

Suggested reviewers

  • adriengentil
  • eranco74
  • danmanor
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: switching disconnected Gangway overrides to a single CATALOG_INDEX_IMAGE.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only changes CI step-registry shell/YAML files; no Ginkgo test titles were added or modified.
Test Structure And Quality ✅ Passed No Ginkgo test files were modified; the PR only updates ci-operator step-registry config, so this check is not applicable.
Microshift Test Compatibility ✅ Passed Only step-registry shell/YAML files changed; no new Ginkgo tests or MicroShift-unsupported API usage were added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The PR only edits ci-operator step-registry shell/YAML metadata; no new Ginkgo It/Describe tests or SNO-sensitive logic were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only CI step-registry env overrides/docs changed; no manifests, controllers, affinity, nodeSelectors, replicas, or PDBs were added.
Ote Binary Stdout Contract ✅ Passed PASS: The PR only changes ci-operator step-registry shell/YAML config and a symlinked commands script; it doesn't modify any OTE binary entrypoints or suite setup code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only updates step-registry env/override config; no new Ginkgo tests or IPv4/external connectivity code was added.
No-Weak-Crypto ✅ Passed Touched files only rewire CI env vars; no weak crypto primitives, custom crypto, or secret/token comparisons appear in the diff.
Container-Privileges ✅ Passed Touched files only change Gangway env vars; no privileged, hostPID/Network/IPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings appear.
No-Sensitive-Data-In-Logs ✅ Passed The diff only swaps catalog-index override vars/docs; it introduces no new logging of passwords, tokens, PII, or other sensitive data.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from albarbaro and josephca June 26, 2026 07:35
@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

[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

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 Jun 26, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@zdrapela: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-redhat-developer-rhdh-main-e2e-ocp-disconnected-helm-nightly N/A periodic Registry content changed
periodic-ci-redhat-developer-rhdh-release-1.10-e2e-ocp-disconnected-helm-nightly N/A periodic Registry content changed
periodic-ci-redhat-developer-rhdh-main-e2e-ocp-disconnected-operator-nightly N/A periodic Registry content changed
periodic-ci-redhat-developer-rhdh-release-1.10-e2e-ocp-disconnected-operator-nightly N/A periodic Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

@zdrapela: all tests passed!

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant