From 2396b908ec80679451faabd65f5698fbfd4bf787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20Dr=C3=A1pela?= <zbynek.drapela@gmail.com>
Date: Fri, 26 Jun 2026 09:34:43 +0200
Subject: [PATCH] feat(rhdh): align disconnected CATALOG_INDEX_IMAGE as single
 Gangway 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
---
 ...-ocp-helm-disconnected-nightly-commands.sh | 20 +++++--------------
 ...hdh-ocp-helm-disconnected-nightly-ref.yaml | 10 ++--------
 ...ocp-operator-disconnected-nightly-ref.yaml | 10 ++--------
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
index 1aadb645c63ca..e121709040f61 100755
--- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
+++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
@@ -86,11 +86,9 @@ TAG_NAME=""
 IMAGE_REPO=""
 IMAGE_REGISTRY="quay.io"
 QUAY_REPO=""
-CATALOG_INDEX_REGISTRY=""
-CATALOG_INDEX_REPO=""
-CATALOG_INDEX_TAG=""
+CATALOG_INDEX_IMAGE=""
 CHART_VERSION=""
-export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME GIT_PR_NUMBER TAG_NAME IMAGE_REPO IMAGE_REGISTRY QUAY_REPO CATALOG_INDEX_REGISTRY CATALOG_INDEX_REPO CATALOG_INDEX_TAG CHART_VERSION
+export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME GIT_PR_NUMBER TAG_NAME IMAGE_REPO IMAGE_REGISTRY QUAY_REPO CATALOG_INDEX_IMAGE CHART_VERSION
 
 echo "========== Gangway API Overrides =========="
 if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_GITHUB_ORG_NAME}" ]]; then
@@ -121,17 +119,9 @@ if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_IMAGE_REGISTRY}" ]]; then
     IMAGE_REGISTRY="${MULTISTAGE_PARAM_OVERRIDE_IMAGE_REGISTRY}"
     echo "Override applied: IMAGE_REGISTRY=${IMAGE_REGISTRY}"
 fi
-if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY}" ]]; then
-    CATALOG_INDEX_REGISTRY="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY}"
-    echo "Override applied: CATALOG_INDEX_REGISTRY=${CATALOG_INDEX_REGISTRY}"
-fi
-if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO}" ]]; then
-    CATALOG_INDEX_REPO="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO}"
-    echo "Override applied: CATALOG_INDEX_REPO=${CATALOG_INDEX_REPO}"
-fi
-if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG}" ]]; then
-    CATALOG_INDEX_TAG="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG}"
-    echo "Override applied: CATALOG_INDEX_TAG=${CATALOG_INDEX_TAG}"
+if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}" ]]; then
+    CATALOG_INDEX_IMAGE="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}"
+    echo "Override applied: CATALOG_INDEX_IMAGE=${CATALOG_INDEX_IMAGE}"
 fi
 if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION}" ]]; then
     CHART_VERSION="${MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION}"
diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml
index e149286504fd2..304149384bfa6 100644
--- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml
+++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml
@@ -33,15 +33,9 @@ ref:
     - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME
       default: ""
       documentation: Optional. Overrides TAG_NAME via Gangway API.
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY
+    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
       default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_REGISTRY via Gangway API (default quay.io).
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO
-      default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_REPO via Gangway API (default rhdh/plugin-catalog-index).
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG
-      default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_TAG via Gangway API (default derived from branch).
+      documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.10).
     - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION
       default: ""
       documentation: Optional. Overrides CHART_VERSION via Gangway API.
diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml
index 7c9120c035f4f..facce70bcd3a3 100644
--- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml
+++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml
@@ -33,15 +33,9 @@ ref:
     - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME
       default: ""
       documentation: Optional. Overrides TAG_NAME via Gangway API.
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY
+    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
       default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_REGISTRY via Gangway API (default quay.io).
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO
-      default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_REPO via Gangway API (default rhdh/plugin-catalog-index).
-    - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG
-      default: ""
-      documentation: Optional. Overrides CATALOG_INDEX_TAG via Gangway API (default derived from branch).
+      documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.10).
     - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION
       default: ""
       documentation: Optional. Overrides CHART_VERSION via Gangway API.