diff --git a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-commands.sh index 0614851b847a0..60718082ff131 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-commands.sh @@ -28,6 +28,8 @@ GITHUB_ORG_NAME="redhat-developer" GITHUB_REPOSITORY_NAME="rhdh-plugin-export-overlays" OVERLAY_BRANCH="" REHEARSE_PR_NUMBER="" # Set overlay repo PR number for rehearse testing +CATALOG_INDEX_IMAGE="" +PLAYWRIGHT_VERSION="" # ── Gangway API Overrides ──────────────────────────────────────────────────── @@ -47,6 +49,14 @@ if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER}" ]]; then REHEARSE_PR_NUMBER="${MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER}" echo "Override applied: REHEARSE_PR_NUMBER=${REHEARSE_PR_NUMBER}" fi +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_PLAYWRIGHT_VERSION}" ]]; then + PLAYWRIGHT_VERSION="${MULTISTAGE_PARAM_OVERRIDE_PLAYWRIGHT_VERSION}" + echo "Override applied: PLAYWRIGHT_VERSION=${PLAYWRIGHT_VERSION}" +fi # ── Environment ────────────────────────────────────────────────────────────── @@ -90,7 +100,7 @@ if [[ "$JOB_MODE" == "pr-check" ]]; then export GIT_PR_NUMBER fi -export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME JOB_MODE +export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME JOB_MODE CATALOG_INDEX_IMAGE PLAYWRIGHT_VERSION echo "Repository: ${GITHUB_ORG_NAME}/${GITHUB_REPOSITORY_NAME}" echo "Branch: ${RELEASE_BRANCH_NAME}, Mode: ${JOB_MODE}, PR: ${GIT_PR_NUMBER:-none}" diff --git a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-ref.yaml index 1fc361f3353e9..0777f7bceb287 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/ocp/helm/redhat-developer-rhdh-plugin-export-overlays-ocp-helm-ref.yaml @@ -19,6 +19,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER default: "" documentation: Optional. Overrides GIT_PR_NUMBER via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_PLAYWRIGHT_VERSION + default: "" + documentation: Optional. Overrides PLAYWRIGHT_VERSION via Gangway API for Playwright browser installation. grace_period: 5m from_image: name: rhdh-e2e-runner diff --git a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-commands.sh index c99b51ba432e7..ab4f8b3cc9616 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-commands.sh @@ -9,6 +9,8 @@ OVERRIDE_VARS=( "${MULTISTAGE_PARAM_OVERRIDE_GITHUB_REPOSITORY_NAME}" "${MULTISTAGE_PARAM_OVERRIDE_RELEASE_BRANCH_NAME}" "${MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER}" + "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}" + "${MULTISTAGE_PARAM_OVERRIDE_PLAYWRIGHT_VERSION}" ) for override in "${OVERRIDE_VARS[@]}"; do if [[ -n "${override}" ]]; then diff --git a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-ref.yaml index 2f7eea4fa21c6..5ce10e5997c0a 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh-plugin-export-overlays/send/data-router/redhat-developer-rhdh-plugin-export-overlays-send-data-router-ref.yaml @@ -18,6 +18,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER default: "" documentation: Optional. Overrides GIT_PR_NUMBER via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_PLAYWRIGHT_VERSION + default: "" + documentation: Optional. Overrides PLAYWRIGHT_VERSION via Gangway API for Playwright browser installation. from_image: name: droute namespace: dno diff --git a/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-commands.sh index a4260db037f07..cea5dce390824 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-commands.sh @@ -13,7 +13,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -44,6 +46,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE diff --git a/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-ref.yaml index ad95fe5ee54fb..ef8e288320fdc 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/aks/helm/nightly/redhat-developer-rhdh-aks-helm-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/aks/operator/nightly/redhat-developer-rhdh-aks-operator-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/aks/operator/nightly/redhat-developer-rhdh-aks-operator-nightly-ref.yaml index 0869302dc7209..6773e4fea19b0 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/aks/operator/nightly/redhat-developer-rhdh-aks-operator-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/aks/operator/nightly/redhat-developer-rhdh-aks-operator-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-commands.sh index 38c3334a7d5e7..4c293c6786232 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-commands.sh @@ -13,7 +13,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -44,6 +46,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE diff --git a/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-ref.yaml index b9c3b241ac028..4698609e38262 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/eks/helm/nightly/redhat-developer-rhdh-eks-helm-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/eks/operator/nightly/redhat-developer-rhdh-eks-operator-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/eks/operator/nightly/redhat-developer-rhdh-eks-operator-nightly-ref.yaml index a55b720205de8..4868434afdb70 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/eks/operator/nightly/redhat-developer-rhdh-eks-operator-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/eks/operator/nightly/redhat-developer-rhdh-eks-operator-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-commands.sh index 1f1efa82dde6f..47d1760e0655c 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-commands.sh @@ -13,7 +13,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -44,6 +46,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE diff --git a/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-ref.yaml index 3e3d332a322f4..8d94be12c0141 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/gke/helm/nightly/redhat-developer-rhdh-gke-helm-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/gke/operator/nightly/redhat-developer-rhdh-gke-operator-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/gke/operator/nightly/redhat-developer-rhdh-gke-operator-nightly-ref.yaml index 00cf20218393b..be995bfa3b48d 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/gke/operator/nightly/redhat-developer-rhdh-gke-operator-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/gke/operator/nightly/redhat-developer-rhdh-gke-operator-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-commands.sh index 899801e929f1d..23f1ba45c1823 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-commands.sh @@ -14,7 +14,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -45,6 +47,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-ref.yaml index 3dd02b6603e65..8f73fc9f67bde 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/nightly/redhat-developer-rhdh-ocp-helm-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-commands.sh index f018687ab5000..f9de59a00b600 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-commands.sh @@ -14,7 +14,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -45,6 +47,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Check for [skip-e2e] commit comments in the PR title ==========" # Check for [skip-e2e] commit comments in the PR title diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-ref.yaml index bd4b696ef6b84..643e36e08ce11 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/redhat-developer-rhdh-ocp-helm-ref.yaml @@ -28,6 +28,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-commands.sh index 899801e929f1d..d27994f5a9cd1 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-commands.sh @@ -14,7 +14,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -45,6 +47,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE @@ -238,6 +248,7 @@ else fi fi QUAY_REPO="${IMAGE_REPO}" # Keep QUAY_REPO in sync for backward compatibility +export IMAGE_REPO IMAGE_REGISTRY QUAY_REPO echo "========== Current branch ==========" echo "Current branch: $(git branch --show-current)" diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-ref.yaml index 65387db9fa8a6..c40b3f60adfa5 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/helm/upgrade/nightly/redhat-developer-rhdh-ocp-helm-upgrade-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/nightly/redhat-developer-rhdh-ocp-operator-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/nightly/redhat-developer-rhdh-ocp-operator-nightly-ref.yaml index b5033b989644d..a0d83bae510e4 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/nightly/redhat-developer-rhdh-ocp-operator-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/ocp/operator/nightly/redhat-developer-rhdh-ocp-operator-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-commands.sh index 728027da6bc82..f6d09c2db36f6 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-commands.sh @@ -14,7 +14,9 @@ TAG_NAME="" IMAGE_REPO="" IMAGE_REGISTRY="quay.io" QUAY_REPO="" -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="" +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 @@ -45,6 +47,14 @@ 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_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}" + echo "Override applied: CHART_VERSION=${CHART_VERSION}" +fi echo "========== Workdir Setup ==========" export HOME WORKSPACE diff --git a/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-ref.yaml index 10be839dfe9ff..e1c08092ca19c 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/osd-gcp/helm/nightly/redhat-developer-rhdh-osd-gcp-helm-nightly-ref.yaml @@ -30,6 +30,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: rhdh-e2e-runner namespace: ci diff --git a/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh b/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh index 0a768907d4b9d..3de25deafc75c 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh +++ b/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-commands.sh @@ -12,6 +12,8 @@ OVERRIDE_VARS=( "${MULTISTAGE_PARAM_OVERRIDE_RELEASE_BRANCH_NAME}" "${MULTISTAGE_PARAM_OVERRIDE_GIT_PR_NUMBER}" "${MULTISTAGE_PARAM_OVERRIDE_TAG_NAME}" + "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}" + "${MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION}" ) for override in "${OVERRIDE_VARS[@]}"; do if [[ -n "${override}" ]]; then diff --git a/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-ref.yaml b/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-ref.yaml index aa7e6764f4e90..6a9edee119f4d 100644 --- a/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-ref.yaml +++ b/ci-operator/step-registry/redhat-developer/rhdh/send/data-router/redhat-developer-rhdh-send-data-router-ref.yaml @@ -27,6 +27,12 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME default: "" documentation: Optional. Overrides TAG_NAME via Gangway API. + - name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE + default: "" + documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.5). + - name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION + default: "" + documentation: Optional. Overrides CHART_VERSION via Gangway API. from_image: name: droute namespace: dno