Add a single retry to VM package install steps.

These are potentially flaky due to network issues, so hopefully this
will reduce the number of manual retries needed.

diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml
index 667593a529e85c9a7811b09a9350b54c7bdab39c..2aaab098060b033e44c43b3d05d4820393d63ffe 100644 (file)
--- a/.github/workflows/vm.yml
+++ b/.github/workflows/vm.yml
@@ -33,7 +33,7 @@ jobs:
         release: ${{ matrix.target }}
         usesh: true
         prepare: |
-          pkg install -y sudo
+          timeout 600 pkg install -y sudo || pkg install -y sudo
           pw useradd builder -m
           echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >>/usr/local/etc/sudoers
           mkdir -p /var/empty /usr/local/etc
@@ -98,12 +98,13 @@ jobs:
         prepare: |
           case $(uname -r) in
           12.*)
-            ftp ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.32.tar.gz
+            timeout 600 ftp ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.32.tar.gz || \
+              ftp ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.32.tar.gz
             tar xfz sudo-1.8.32.tar.gz
             (cd sudo-1.8.32 && ./configure --sysconfdir=/usr/local/etc && make && make install)
             ;;
           *)
-            pkg install -y sudo
+            timeout 600 pkg install -y sudo || pkg install -y sudo
             ;;
           esac
           openssl rand -base64 9 >$GITHUB_WORKSPACE/regress/password
@@ -182,7 +183,7 @@ jobs:
           case "$(uname -r)" in
           9.*) export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/9.0_2026Q1/All" ;;
           esac
-          /usr/sbin/pkg_add sudo
+          timeout 600 /usr/sbin/pkg_add sudo || /usr/sbin/pkg_add sudo
           openssl rand -base64 9 >$GITHUB_WORKSPACE/regress/password
           pw=$(tr -d '\n' <$GITHUB_WORKSPACE/regress/password | pwhash)
           /usr/sbin/useradd -m -p "${pw}" builder
@@ -254,8 +255,8 @@ jobs:
         prepare: |
           set -x
           if [ ! -x $(which gcc 2>/dev/null) ]; then
-            pfexec pkg refresh
-            pfexec pkg install build-essential
+            timeout 900 pfexec pkg refresh || pfexec pkg refresh
+            timeout 900 pfexec pkg install build-essential || pfexec pkg install build-essential
           fi
           useradd -m builder
           sed -e "s/^root.*ALL$/root ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers >>/tmp/sudoers
@@ -355,6 +356,7 @@ jobs:
           "20022": "22"
         usesh: true
         prepare: |
+          timeout 600 pkg_add git || pkg_add git
           useradd -g wobj -m builder
           echo "permit nopass keepenv root" >/etc/doas.conf
           echo "permit nopass keepenv builder" >>/etc/doas.conf
@@ -362,7 +364,6 @@ jobs:
           chown root:wheel /etc/doas.conf
           chmod 644 /etc/doas.conf
           touch /etc/ssh/ssh_known_hosts
-          pkg_add git
 
     - name: fetch sysupgrade version
       run: |