From ca256055f8a9b221bda0329b4615437125864e99 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Mon, 12 Jan 2026 17:36:25 -0600 Subject: [PATCH] [multipass] allow rpios emulation to reboot and continue --- multipass/run_parallel_iiab_test.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/multipass/run_parallel_iiab_test.sh b/multipass/run_parallel_iiab_test.sh index f1bfd30..8a39dd4 100644 --- a/multipass/run_parallel_iiab_test.sh +++ b/multipass/run_parallel_iiab_test.sh @@ -67,7 +67,7 @@ LOCAL_VARS_URL="${LOCAL_VARS_URL:-https://raw.githubusercontent.com/iiab/iiab/re WAIT_TRIES="${WAIT_TRIES:-60}" # used ONLY for the first auto-resume WAIT_SLEEP="${WAIT_SLEEP:-5}" -STAGGER="${STAGGER:-20}" +STAGGER="${STAGGER:-30}" RESUME_TRIES="${RESUME_TRIES:-3}" RESUME_RETRY_SLEEP="${RESUME_RETRY_SLEEP:-8}" @@ -180,8 +180,8 @@ if [[ ( "$FIRST_UBUNTU" == "1" || "$FIRST_DEBIAN" == "1" ) && "$BOTH_DISTROS" != exit 2 fi -if (( COUNT < 1 )); then - echo "[ERROR] COUNT must be >= 1" >&2 +if ! [[ "${COUNT}" =~ ^[0-9]+$ ]] || (( COUNT < 1 )); then + echo "[ERROR] COUNT must be an integer >= 1 (got: '${COUNT}')" >&2 exit 2 fi # --- @@ -412,7 +412,10 @@ run_install_txt() { echo "[INFO] Waiting for VM readiness before install: $vm" if ! wait_for_vm "$vm"; then - echo "[ERROR] VM did not become ready in time (install phase): $vm" + { + echo "[INFO] Waiting for VM readiness before install: $vm" + echo "[ERROR] VM did not become ready in time (install phase): $vm" + } >"$log" echo "88" >"$rc" set_latest_links "$vm" "install" "$log" "$rc" return 88 @@ -639,7 +642,7 @@ pipeline_parallel_stagger() { run_install_txt "$vm" # Only Ubuntu tends to reboot during install; Debian often doesn't. local waitflag=1 - if [[ "$vm" == deb13-* || "$vm" == rpios-d13-* ]]; then + if [[ "$vm" == deb13-* ]]; then waitflag=0 fi resume_iiab "$vm" "$waitflag"