Compare commits

..

No commits in common. "18d31c1b1b71892f02e683644ea55aa54c7c61c7" and "1d1b23916e9f182bb34b99cf19e0cdf8aac08071" have entirely different histories.

1 changed files with 5 additions and 24 deletions

View File

@ -149,7 +149,7 @@ fi
# Default module # Default module
if [[ "${#modules[@]}" -eq 0 ]]; then if [[ "${#modules[@]}" -eq 0 ]]; then
modules=("") modules=("code")
fi fi
# If no --pr provided, take from env IIAB_PR (space-separated) # If no --pr provided, take from env IIAB_PR (space-separated)
@ -174,7 +174,6 @@ fi
LOGROOT="${LOGROOT:-iiab_multipass_runs_$(date +%Y%m%d)}" LOGROOT="${LOGROOT:-iiab_multipass_runs_$(date +%Y%m%d)}"
mkdir -p "$LOGROOT" mkdir -p "$LOGROOT"
echo "[INFO] Logging files stored at: $LOGROOT"
stamp() { date +%H%M%S; } stamp() { date +%H%M%S; }
@ -333,6 +332,7 @@ run_install_txt() {
log="$LOGROOT/${vm}.install.${t}.log" log="$LOGROOT/${vm}.install.${t}.log"
rc="$LOGROOT/${vm}.install.${t}.rc" rc="$LOGROOT/${vm}.install.${t}.rc"
echo "[INFO] Logging files stored at: $LOGROOT"
echo "[INFO] install.txt in $vm (log $(basename "$log")) ..." echo "[INFO] install.txt in $vm (log $(basename "$log")) ..."
local modules_str pr_str local modules_str pr_str
@ -392,22 +392,8 @@ run_install_txt() {
fi fi
echo "--- install.txt ---" echo "--- install.txt ---"
INSTALL_PRIMARY="https://iiab.io/install.txt" echo "curl -fsSL https://iiab.io/install.txt | bash -s -- ${install_args[*]}"
INSTALL_FALLBACK="https://raw.githubusercontent.com/iiab/iiab-factory/refs/heads/master/install.txt" curl -fsSL https://iiab.io/install.txt | bash -s -- "${install_args[@]}"
CURL="curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 15"
tmp_install="$(mktemp)"
if $CURL "$INSTALL_PRIMARY" -o "$tmp_install"; then
:
else
echo "Warning: failed to fetch $INSTALL_PRIMARY"
echo "Falling back to $INSTALL_FALLBACK"
$CURL "$INSTALL_FALLBACK" -o "$tmp_install"
fi
echo "bash -s -- ${install_args[*]} < \"$tmp_install\""
bash -s -- "${install_args[@]}" < "$tmp_install"
rm -f "$tmp_install"
echo "--- install done ---" echo "--- install done ---"
' >"$log" 2>&1 ' >"$log" 2>&1
@ -516,12 +502,7 @@ pipeline_parallel_stagger() {
sleep $((i * STAGGER)) sleep $((i * STAGGER))
launch_one "$vm" launch_one "$vm"
run_install_txt "$vm" run_install_txt "$vm"
# Only Ubuntu tends to reboot during install; Debian often doesn't. resume_iiab "$vm" 1
local waitflag=1
if [[ "${VM_IMAGE[$vm]}" == "$DEBIAN13_IMAGE_URL" ]]; then
waitflag=0
fi
resume_iiab "$vm" "$waitflag"
) & ) &
pids+=("$!") pids+=("$!")
done done