mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-02-07 07:43:21 +03:00
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 <behlendorf1@llnl.gov> Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de> Closes #16555
This commit is contained in:
parent
e2bded28ea
commit
484f92b8fa
1
.github/workflows/scripts/qemu-7-prepare.sh
vendored
1
.github/workflows/scripts/qemu-7-prepare.sh
vendored
@ -18,6 +18,7 @@ if [ -z ${VMs:-} ]; then
|
|||||||
cd $RESPATH
|
cd $RESPATH
|
||||||
echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
|
echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
|
||||||
| tee summary.txt | tee /tmp/summary.txt
|
| tee summary.txt | tee /tmp/summary.txt
|
||||||
|
cp /var/tmp/*.txt .
|
||||||
tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
|
tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
@ -34,13 +34,14 @@ function send2github() {
|
|||||||
if [ ! -f out-1.md ]; then
|
if [ ! -f out-1.md ]; then
|
||||||
logfile="1"
|
logfile="1"
|
||||||
for tarfile in Logs-functional-*/qemu-*.tar; do
|
for tarfile in Logs-functional-*/qemu-*.tar; do
|
||||||
|
rm -rf vm* *.txt
|
||||||
if [ ! -s "$tarfile" ]; then
|
if [ ! -s "$tarfile" ]; then
|
||||||
output "\n## Functional Tests: unknown\n"
|
output "\n## Functional Tests: unknown\n"
|
||||||
output ":exclamation: Tarfile $tarfile is empty :exclamation:"
|
output ":exclamation: Tarfile $tarfile is empty :exclamation:"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
rm -rf vm* *.txt
|
|
||||||
tar xf "$tarfile"
|
tar xf "$tarfile"
|
||||||
|
test -s env.txt || continue
|
||||||
source env.txt
|
source env.txt
|
||||||
output "\n## Functional Tests: $OSNAME\n"
|
output "\n## Functional Tests: $OSNAME\n"
|
||||||
outfile_plain uname.txt
|
outfile_plain uname.txt
|
||||||
|
Loading…
Reference in New Issue
Block a user