From 9ed3548fc84cbdbc063b1b4ffb9e028436739981 Mon Sep 17 00:00:00 2001 From: radeore Date: Fri, 27 Feb 2026 16:12:04 -0500 Subject: [PATCH] Debug pre-merge prow vSphere hybrid mixed cluster --- .../release/openshift-release-main__nightly-4.22.yaml | 1 + .../openshift-e2e-vsphere-upi-hybrid-env-workflow.yaml | 1 + .../upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-commands.sh | 3 ++- .../upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-ref.yaml | 4 ++++ .../upi/conf/vsphere/zones/upi-conf-vsphere-zones-commands.sh | 3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml index 1fc98da4dd9e6..6967f54b509eb 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml @@ -1115,6 +1115,7 @@ tests: CSI_MANAGEMENT_REMOVED: "true" FEATURE_GATES: '["VSphereMixedNodeEnv=true"]' FEATURE_SET: CustomNoUpgrade + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: registry.build07.ci.openshift.org/ci-ln-z8dhs42/release:latest STORAGE_CO_DEGRADE_CHECK: "true" TEST_SKIPS: \[sig-storage\]\|\[sig-arch\]\[Early\] Operators low level operators workflow: openshift-e2e-vsphere-upi-hybrid-env diff --git a/ci-operator/step-registry/openshift/e2e/vsphere/upi/hybrid-env/openshift-e2e-vsphere-upi-hybrid-env-workflow.yaml b/ci-operator/step-registry/openshift/e2e/vsphere/upi/hybrid-env/openshift-e2e-vsphere-upi-hybrid-env-workflow.yaml index 25ab03d47f9f1..99e639c2ce664 100644 --- a/ci-operator/step-registry/openshift/e2e/vsphere/upi/hybrid-env/openshift-e2e-vsphere-upi-hybrid-env-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/vsphere/upi/hybrid-env/openshift-e2e-vsphere-upi-hybrid-env-workflow.yaml @@ -4,6 +4,7 @@ workflow: pre: - chain: upi-vsphere-pre - ref: ipi-install-vsphere-virt + - ref: wait test: - ref: openshift-e2e-test post: diff --git a/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-commands.sh b/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-commands.sh index cfeedf5ef1911..059468eccda0b 100755 --- a/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-commands.sh +++ b/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-commands.sh @@ -205,7 +205,8 @@ echo "${lb_ip_address}" >>"${SHARED_DIR}"/vips.txt echo "${lb_ip_address}" >>"${SHARED_DIR}"/vips.txt export HOME=/tmp -export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} +# Use job-level override if set (e.g. custom OCP image for debug cluster); otherwise use release controller image. +export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE:-$RELEASE_IMAGE_LATEST} # Ensure ignition assets are configured with the correct invoker to track CI jobs. export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID} diff --git a/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-ref.yaml b/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-ref.yaml index 05fd78eeef5de..04e5e7d665c94 100644 --- a/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-ref.yaml +++ b/ci-operator/step-registry/upi/conf/vsphere/vcm/upi-conf-vsphere-vcm-ref.yaml @@ -8,6 +8,10 @@ ref: default: "3" - name: COMPUTE_NODE_REPLICAS default: "3" + - name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE + default: "" + documentation: |- + Optional. Override the OCP release image pull spec for install (e.g. for debug). If set, used instead of the release controller image. - name: PULL_THROUGH_CACHE default: "enabled" documentation: |- diff --git a/ci-operator/step-registry/upi/conf/vsphere/zones/upi-conf-vsphere-zones-commands.sh b/ci-operator/step-registry/upi/conf/vsphere/zones/upi-conf-vsphere-zones-commands.sh index 7492ef427687e..da7a1cc0bff36 100755 --- a/ci-operator/step-registry/upi/conf/vsphere/zones/upi-conf-vsphere-zones-commands.sh +++ b/ci-operator/step-registry/upi/conf/vsphere/zones/upi-conf-vsphere-zones-commands.sh @@ -88,7 +88,8 @@ echo "${lb_ip_address}" >>"${SHARED_DIR}"/vips.txt echo "${lb_ip_address}" >>"${SHARED_DIR}"/vips.txt export HOME=/tmp -export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} +# Use job-level override if set (e.g. custom OCP image for debug cluster); otherwise use release controller image. +export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE:-$RELEASE_IMAGE_LATEST} # Ensure ignition assets are configured with the correct invoker to track CI jobs. export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME_SAFE}/${BUILD_ID}