From e52e9b6986289c355209ca5764a6cc8a619f10ee Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@gmail.com>
Date: Thu, 13 Aug 2026 10:38:51 -0700
Subject: [PATCH] baremetalds: tolerate IDMS MCP wait in degraded TNF

A fenced master cannot converge its MCP. Allow degraded jobs to continue after a short best-effort wait while retaining strict waits elsewhere.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
---
 .../e2e/test/baremetalds-e2e-test-commands.sh          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
index 049ae2633abbc..b1d793f5cf7b2 100644
--- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
+++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
@@ -384,9 +384,10 @@ packet|equinix*)
         echo "### IDMS check: DS_IP_STACK=${DS_IP_STACK} DS_OPENSHIFT_VERSION=${DS_OPENSHIFT_VERSION}"
         if [[ "${DS_IP_STACK}" == "v6" ]] && is_openshift_version_gte "4.13"; then
             echo "### Creating ImageDigestMirrorSet for test images on disconnected cluster"
-            ssh "${SSHOPTS[@]}" "root@${IP}" bash -s -- "${DEVSCRIPTS_TEST_IMAGE_REPO}" << 'IDMS_EOF'
+            ssh "${SSHOPTS[@]}" "root@${IP}" bash -s -- "${DEVSCRIPTS_TEST_IMAGE_REPO}" "${SKIP_READINESS_CHECKS:-false}" << 'IDMS_EOF'
                 set -euo pipefail
                 LOCAL_REPO="$1"
+                SKIP_MCP_WAIT="$2"
                 oc apply -f - <<EOF
 apiVersion: config.openshift.io/v1
 kind: ImageDigestMirrorSet
@@ -400,7 +401,12 @@ spec:
 EOF
                 echo "Waiting for machine-config operator to reconcile IDMS..."
                 oc wait mcp --all --for=condition=Updating=True --timeout=5m || true
-                oc wait mcp --all --for=condition=Updated=true --timeout=10m
+                if [[ "${SKIP_MCP_WAIT}" == "true" ]]; then
+                    echo "Degraded cluster: MCP wait is best-effort (fenced node cannot reconcile)"
+                    oc wait mcp --all --for=condition=Updated=true --timeout=2m || true
+                else
+                    oc wait mcp --all --for=condition=Updated=true --timeout=10m
+                fi
 IDMS_EOF
         fi
     else