From 7a60c6c57567d3170bef6e2932d4e1d1e5bd6d75 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Sun, 15 Sep 2024 09:17:03 +0200 Subject: [PATCH] FreeBSD13-e1000 --- .github/workflows/scripts/qemu-2-start.sh | 2 ++ .github/workflows/scripts/qemu-7-prepare.sh | 2 +- .github/workflows/zfs-qemu.yml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh index 6c67edccbf4..d64b389933e 100755 --- a/.github/workflows/scripts/qemu-2-start.sh +++ b/.github/workflows/scripts/qemu-2-start.sh @@ -67,6 +67,7 @@ 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" @@ -74,6 +75,7 @@ case "$OS" in 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 index 29767d3be87..9e4d1204728 100755 --- 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
\n$t\n
\n" >> failed.txt
+  echo -e "\n
\n$t
" >> failed.txt
   cat /tmp/fail.txt >> failed.txt
   echo -e "
" >> failed.txt done diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml index a3381a955e9..c4038d4fade 100644 --- 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