Skip to content

baremetalds: tolerate IDMS MCP wait in degraded TNF #83403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jluhrsen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

baremetalds: tolerate IDMS MCP wait in degraded TNF #83403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down