FreeBSD13-e1000

mcmilk · Sep 15, 2024 · 7a60c6c · 7a60c6c
1 parent 0fed772
commit 7a60c6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh
@@ -67,13 +67,15 @@ case "$OS" in
     URLzs="$FREEBSD/amd64-freebsd-13.3-RELEASE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     NIC="rtl8139"
+    NIC="e1000"
     ;;
   freebsd13)
     OSNAME="FreeBSD 13.4-STABLE"
     OSv="freebsd13.0"
     URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     NIC="rtl8139"
+    NIC="e1000"
     ;;
   freebsd14r)
     OSNAME="FreeBSD 14.1-RELEASE"

diff --git a/.github/workflows/scripts/qemu-7-prepare.sh b/.github/workflows/scripts/qemu-7-prepare.sh
@@ -98,7 +98,7 @@ cat summary.txt \
   cat /tmp/fail.txt | $BASE/scripts/zfs-tests-color.sh >> /tmp/failed.txt
   echo "##[endgroup]" >> /tmp/failed.txt
   # Job Summary:
-  echo -e "\n<details>\n<summary>$t</summary>\n<pre>\n" >> failed.txt
+  echo -e "\n<details>\n<summary>$t</summary><pre>" >> failed.txt
   cat /tmp/fail.txt >> failed.txt
   echo -e "</pre></details>" >> failed.txt
 done

diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml
@@ -14,9 +14,9 @@ jobs:
         # all:
         # os:  [almalinux8, almalinux9, archlinux, centos-stream9, fedora39, fedora40, debian11, debian12, freebsd13, freebsd13r, freebsd14, freebsd14r, freebsd15, ubuntu20, ubuntu22, ubuntu24]
         # openzfs:
-        os: [almalinux8, almalinux9, centos-stream9, debian11, debian12, fedora39, fedora40, freebsd13, freebsd13r, freebsd14, freebsd14r]
+        # os: [almalinux8, almalinux9, centos-stream9, debian11, debian12, fedora39, fedora40, freebsd13, freebsd13r, freebsd14, freebsd14r]
         # freebsd:
-        # os: [freebsd13, freebsd14]
+        os: [freebsd13, freebsd13r]
         # small test:
         # os: [archlinux]
     runs-on: ubuntu-24.04