From 6dc5eabe3d4a9a27094625c8f9c0b1e309b77eae Mon Sep 17 00:00:00 2001 From: Gustavo Lira Date: Fri, 29 May 2026 12:16:38 -0300 Subject: [PATCH 1/2] test(ci): pin RHDH 1.10 RC image (1.10-128) in showcase value files [skip-build] Point values_showcase.yaml and values_showcase-rbac.yaml at the RHDH 1.10 RC image quay.io/rhdh/rhdh-hub-rhel9:1.10-128 for release-1.10 e2e testing. Note: CI may override the image via --set upstream.backstage.image.* (IMAGE_REGISTRY/IMAGE_REPO/TAG_NAME) depending on the job. Co-Authored-By: Claude Opus 4.8 (1M context) --- .ci/pipelines/value_files/values_showcase-rbac.yaml | 6 +++++- .ci/pipelines/value_files/values_showcase.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.ci/pipelines/value_files/values_showcase-rbac.yaml b/.ci/pipelines/value_files/values_showcase-rbac.yaml index 09f0e748ef..8861cadd88 100644 --- a/.ci/pipelines/value_files/values_showcase-rbac.yaml +++ b/.ci/pipelines/value_files/values_showcase-rbac.yaml @@ -149,7 +149,11 @@ upstream: cert: $file: /opt/app-root/src/postgres-crt.pem image: - # Note: registry, repository and tag are set via --set flags in helm upgrade -i commands + # Pinned to RHDH 1.10 RC image for release-1.10 testing. + # Note: CI may still override these via --set upstream.backstage.image.* (IMAGE_REGISTRY/IMAGE_REPO/TAG_NAME). + registry: quay.io + repository: rhdh/rhdh-hub-rhel9 + tag: "1.10-128" pullPolicy: Always startupProbe: diff --git a/.ci/pipelines/value_files/values_showcase.yaml b/.ci/pipelines/value_files/values_showcase.yaml index 5aa5ffc8fc..a29adcf69a 100644 --- a/.ci/pipelines/value_files/values_showcase.yaml +++ b/.ci/pipelines/value_files/values_showcase.yaml @@ -133,7 +133,11 @@ upstream: token: test-token subject: test-subject image: - # Note: registry, repository and tag are set via --set flags in helm upgrade -i commands + # Pinned to RHDH 1.10 RC image for release-1.10 testing. + # Note: CI may still override these via --set upstream.backstage.image.* (IMAGE_REGISTRY/IMAGE_REPO/TAG_NAME). + registry: quay.io + repository: rhdh/rhdh-hub-rhel9 + tag: "1.10-128" pullPolicy: Always extraEnvVars: From aa5dbf075456f48a5df1c3aa07936925067eea7f Mon Sep 17 00:00:00 2001 From: Gustavo Lira Date: Fri, 29 May 2026 12:25:11 -0300 Subject: [PATCH 2/2] test(ci): force RHDH 1.10 RC image (1.10-128) via env_variables.sh [skip-build] helm::get_image_params() injects --set upstream.backstage.image.* from IMAGE_REGISTRY/IMAGE_REPO/TAG_NAME, which overrides the value files. Force these to quay.io/rhdh/rhdh-hub-rhel9:1.10-128 so release-1.10 e2e jobs deploy the RC image regardless of what Prow provides. Temporary; revert after RC testing. Co-Authored-By: Claude Opus 4.8 (1M context) --- .ci/pipelines/env_variables.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.ci/pipelines/env_variables.sh b/.ci/pipelines/env_variables.sh index 622cdac671..573f6eeb09 100755 --- a/.ci/pipelines/env_variables.sh +++ b/.ci/pipelines/env_variables.sh @@ -47,6 +47,16 @@ IMAGE_REGISTRY="${IMAGE_REGISTRY:-quay.io}" IMAGE_REPO="${IMAGE_REPO:-${QUAY_REPO:-rhdh-community/rhdh}}" QUAY_REPO="${IMAGE_REPO}" # Keep QUAY_REPO in sync for backward compatibility +# TEMPORARY (RHDH 1.10 RC validation): force the release-1.10 e2e jobs to deploy the +# RHDH 1.10 RC image quay.io/rhdh/rhdh-hub-rhel9:1.10-128. +# helm::get_image_params() (lib/helm.sh) injects IMAGE_REGISTRY/IMAGE_REPO/TAG_NAME via +# `--set upstream.backstage.image.*`, which overrides the value files, so the image must be +# forced here to take effect. Revert this block once RC testing is complete. +IMAGE_REGISTRY="quay.io" +IMAGE_REPO="rhdh/rhdh-hub-rhel9" +QUAY_REPO="${IMAGE_REPO}" +TAG_NAME="1.10-128" + # ============================================================================= # Release and Namespace Configuration # These can be overridden by CI environment or local configuration