From 484f92b8fa36c3d00c99b51df5074bedcf41f417 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Sun, 22 Sep 2024 20:21:42 +0400 Subject: [PATCH] ZTS: Fix Summary Page The qemu-9-summary-page.sh script reads the file env.txt in the first lines. When the module didn't build, this file was not copied into the tarfile - causing the scipt to abort. Fix: copy needed files into the tarfile in case of module build failures. The fix ignores also empty tarfiles in future. Reviewed-by: Brian Behlendorf Signed-off-by: Tino Reichardt Closes #16555 --- .github/workflows/scripts/qemu-7-prepare.sh | 1 + .github/workflows/scripts/qemu-9-summary-page.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/qemu-7-prepare.sh b/.github/workflows/scripts/qemu-7-prepare.sh index 4e2583731..a5fbd7213 100755 --- a/.github/workflows/scripts/qemu-7-prepare.sh +++ b/.github/workflows/scripts/qemu-7-prepare.sh @@ -18,6 +18,7 @@ if [ -z ${VMs:-} ]; then cd $RESPATH echo ":exclamation: ZFS module didn't build successfully :exclamation:" \ | tee summary.txt | tee /tmp/summary.txt + cp /var/tmp/*.txt . tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true exit 0 fi diff --git a/.github/workflows/scripts/qemu-9-summary-page.sh b/.github/workflows/scripts/qemu-9-summary-page.sh index 036004882..2f4c21f99 100755 --- a/.github/workflows/scripts/qemu-9-summary-page.sh +++ b/.github/workflows/scripts/qemu-9-summary-page.sh @@ -34,13 +34,14 @@ function send2github() { if [ ! -f out-1.md ]; then logfile="1" for tarfile in Logs-functional-*/qemu-*.tar; do + rm -rf vm* *.txt if [ ! -s "$tarfile" ]; then output "\n## Functional Tests: unknown\n" output ":exclamation: Tarfile $tarfile is empty :exclamation:" continue fi - rm -rf vm* *.txt tar xf "$tarfile" + test -s env.txt || continue source env.txt output "\n## Functional Tests: $OSNAME\n" outfile_plain uname.txt