Skip to content

Commit

Permalink
ZTS: Fix Summary Page
Browse files Browse the repository at this point in the history
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 <behlendorf1@llnl.gov>
Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
Closes #16555
  • Loading branch information
mcmilk authored Sep 22, 2024
1 parent 3014dcb commit 53b77c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/scripts/qemu-7-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/scripts/qemu-9-summary-page.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53b77c3

Please sign in to comment.