diff --git a/scripts/vmbootloadertest.sh b/scripts/vmbootloadertest.sh index c7e006b..33f8e4f 100755 --- a/scripts/vmbootloadertest.sh +++ b/scripts/vmbootloadertest.sh @@ -40,7 +40,8 @@ log="$VM_DIR.test.log" step() { printf '\n##### %s %s\n' "$(date +%T)" "$*"; } gssh() { vm_ssh -o ConnectTimeout=6 -o LogLevel=ERROR "$@"; } gscript() { gssh env "LOADER=$loader" "HARDWARE=$hw" bash -s < "$guest/$1"; } # the guest's login shell is fish -waitssh() { local _; for _ in $(seq 180); do # up to ~15 minutes: a first boot is slow when several VMs run at once gssh 'uptime -p' 2>/dev/null | grep -q '^up' && return 0; sleep 5; done; echo "FAIL no SSH"; return 1; } +# Up to ~15 minutes for the first ssh: a first boot is slow when several VMs run at once. +waitssh() { local _; for _ in $(seq 180); do gssh 'uptime -p' 2>/dev/null | grep -q '^up' && return 0; sleep 5; done; echo "FAIL no SSH"; return 1; } running() { pgrep -f "[h]ostfwd=tcp::$VM_PORT-" >/dev/null; } stop_vm() { running || return 0