Skip to content

Commit 53b77c3

Browse files
authored
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 <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes #16555
1 parent 3014dcb commit 53b77c3

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/scripts/qemu-7-prepare.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if [ -z ${VMs:-} ]; then
1818
cd $RESPATH
1919
echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
2020
| tee summary.txt | tee /tmp/summary.txt
21+
cp /var/tmp/*.txt .
2122
tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
2223
exit 0
2324
fi

.github/workflows/scripts/qemu-9-summary-page.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ function send2github() {
3434
if [ ! -f out-1.md ]; then
3535
logfile="1"
3636
for tarfile in Logs-functional-*/qemu-*.tar; do
37+
rm -rf vm* *.txt
3738
if [ ! -s "$tarfile" ]; then
3839
output "\n## Functional Tests: unknown\n"
3940
output ":exclamation: Tarfile $tarfile is empty :exclamation:"
4041
continue
4142
fi
42-
rm -rf vm* *.txt
4343
tar xf "$tarfile"
44+
test -s env.txt || continue
4445
source env.txt
4546
output "\n## Functional Tests: $OSNAME\n"
4647
outfile_plain uname.txt

0 commit comments

Comments
 (0)