Merge branch 'marc/debian-release-tests' into tmp/e2e-fix-check

Author: Marketen

.github/workflows/debian-iso-e2e.yml

@@ -29,7 +29,13 @@ jobs:
         run: |
           export BASE_OS=debian
           export UNATTENDED=true
-          docker compose up --build
+          # Retry so a transient mirror outage does not fail the whole E2E run.
+          for attempt in 1 2 3; do
+            docker compose up --build --abort-on-container-exit --exit-code-from dappnode_installer && break
+            [ "${attempt}" -lt 3 ] || exit 1
+            echo "::warning::ISO build attempt ${attempt} failed; retrying in 30s"
+            sleep 30
+          done
           ls -lrt images/Dappnode-debian-*.iso
 
       - name: Install QEMU test dependencies

.github/workflows/ubuntu-iso-e2e.yml

@@ -29,7 +29,13 @@ jobs:
         run: |
           export BASE_OS=ubuntu
           export UNATTENDED=true
-          docker compose up --build
+          # Retry so a transient mirror outage does not fail the whole E2E run.
+          for attempt in 1 2 3; do
+            docker compose up --build --abort-on-container-exit --exit-code-from dappnode_installer && break
+            [ "${attempt}" -lt 3 ] || exit 1
+            echo "::warning::ISO build attempt ${attempt} failed; retrying in 30s"
+            sleep 30
+          done
           ls -lrt images/Dappnode-ubuntu-*.iso
 
       - name: Install QEMU test dependencies

test/e2e_iso_install.sh

@@ -215,9 +215,12 @@ run_e2e_iso_install() {
     # including replies to ping. User networking needs no root but drops ICMP.
     local installer_network_args guest_network_args ssh_host
     if [ -n "${tap_iface}" ]; then
+        # Pin the PCI slot: the USB controller only exists while installing, and
+        # without a fixed address the NIC name would change after the install
+        # (enp0s5 -> enp0s4), unlike on real hardware.
         installer_network_args=(
             -netdev "tap,id=net0,ifname=${tap_iface},script=no,downscript=no"
-            -device "virtio-net-pci,netdev=net0,mac=${guest_mac}"
+            -device "virtio-net-pci,netdev=net0,mac=${guest_mac},addr=0x10"
         )
         guest_network_args=("${installer_network_args[@]}")
         ssh_host=${guest_ip}