wooo/awoooi
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

fix(reboot): extend windows99 verify timeout budget
All checks were successful
CD Pipeline / workflow-shape (push) Successful in 0s
Details
CD Pipeline / cancel-stale-cd (push) Has been skipped
Details
CD Pipeline / tests (push) Successful in 59s
Details
CD Pipeline / build-and-deploy (push) Successful in 4m45s
Details
CD Pipeline / post-deploy-checks (push) Successful in 1m47s
Details

Browse Source
This commit is contained in:
Your Name
2026-07-03 17:30:46 +08:00
parent acbf96cd89
commit e378d6dd33
7 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/reboot-recovery/collect-windows99-vmware-verify.sh
View File

@@ -7,7 +7,7 @@ TARGET_HOST="${WINDOWS99_HOST:-192.168.0.99}"
VIA_HOST="${WINDOWS99_VIA_HOST:-}"
CONNECT_TIMEOUT="${WINDOWS99_CONNECT_TIMEOUT:-3}"
SSH_TIMEOUT="${WINDOWS99_SSH_TIMEOUT:-3}"
REMOTE_VERIFY_TIMEOUT="${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-45}"
REMOTE_VERIFY_TIMEOUT="${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-180}"
SSH_PORT="${WINDOWS99_SSH_PORT:-22}"
MAX_AUTH_USERS="${WINDOWS99_MAX_AUTH_USERS:-}"
MAX_AUTH_USERS_EXPLICIT=0
@@ -37,7 +37,7 @@ if ! is_positive_int "${SSH_TIMEOUT}"; then
SSH_TIMEOUT=3
fi
if ! is_positive_int "${REMOTE_VERIFY_TIMEOUT}"; then
REMOTE_VERIFY_TIMEOUT=45
REMOTE_VERIFY_TIMEOUT=180
fi
if ! is_positive_int "${MAX_AUTH_USERS}"; then
MAX_AUTH_USERS="${#SSH_USERS[@]}"
@@ -99,7 +99,7 @@ if ! is_positive_int "${SSH_TIMEOUT}"; then
SSH_TIMEOUT=3
fi
if ! is_positive_int "${REMOTE_VERIFY_TIMEOUT}"; then
REMOTE_VERIFY_TIMEOUT=45
REMOTE_VERIFY_TIMEOUT=180
fi
if ! is_positive_int "${MAX_AUTH_USERS}"; then
MAX_AUTH_USERS="${#SSH_USERS[@]}"

2
scripts/reboot-recovery/reboot-auto-recovery-slo-exporter.sh
View File

@@ -324,7 +324,7 @@ if [ -f "$ROOT_DIR/scripts/reboot-recovery/windows99-management-channel-probe.py
fi
if [ -x "$ROOT_DIR/scripts/reboot-recovery/collect-windows99-vmware-verify.sh" ]; then
WINDOWS99_MAX_AUTH_USERS="${WINDOWS99_MAX_AUTH_USERS:-5}" \
WINDOWS99_REMOTE_VERIFY_TIMEOUT="${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-90}" \
WINDOWS99_REMOTE_VERIFY_TIMEOUT="${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-180}" \
bash "$ROOT_DIR/scripts/reboot-recovery/collect-windows99-vmware-verify.sh" --collect \
>"$windows99_vmware_file" 2>"$artifact_dir/windows99-vmware-verify.err" \
|| true

2
scripts/reboot-recovery/tests/test_reboot_auto_recovery_slo_installer.py
View File

@@ -109,7 +109,7 @@ def test_exporter_projects_each_scorecard_blocker_to_textfile_metric() -> None:
assert "windows99-vmware-verify.txt" in text
assert "collect-windows99-vmware-verify.sh\" --collect" in text
assert "WINDOWS99_MAX_AUTH_USERS=\"${WINDOWS99_MAX_AUTH_USERS:-5}\"" in text
assert "WINDOWS99_REMOTE_VERIFY_TIMEOUT=\"${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-90}\"" in text
assert "WINDOWS99_REMOTE_VERIFY_TIMEOUT=\"${WINDOWS99_REMOTE_VERIFY_TIMEOUT:-180}\"" in text
assert "WINDOWS99_REQUIRED_VM_ALIASES=\"${WINDOWS99_REQUIRED_VM_ALIASES:-111 188 120 121 112}\"" in text
assert "windows99_vmware_verify_alias_set_matches_current" in text
assert "AWOOOI_WINDOWS99_VMWARE_AUTOSTART=1" in text