Skip to content

Commit 0382519

Browse files
robntonyhutter
authored andcommitted
CI: match and trim out internal timestamp for test prefix
Adjust the regexes to match the test line with timestamps, then remove them for the summary. The internal timestamp is still in the full logs. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes openzfs#17045
1 parent 629108e commit 0382519

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/scripts/qemu-6-tests.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ function prefix() {
2121
S=$((DIFF-(M*60)))
2222

2323
CTR=$(cat /tmp/ctr)
24-
echo $LINE| grep -q "^Test[: ]" && CTR=$((CTR+1)) && echo $CTR > /tmp/ctr
24+
echo $LINE| grep -q '^\[.*] Test[: ]' && CTR=$((CTR+1)) && echo $CTR > /tmp/ctr
2525

2626
BASE="$HOME/work/zfs/zfs"
2727
COLOR="$BASE/scripts/zfs-tests-color.sh"
28-
CLINE=$(echo $LINE| grep "^Test[ :]" | sed -e 's|/usr/local|/usr|g' \
28+
CLINE=$(echo $LINE| grep '^\[.*] Test[: ]' \
29+
| sed -e 's|^\[.*] Test|Test|g' \
30+
| sed -e 's|/usr/local|/usr|g' \
2931
| sed -e 's| /usr/share/zfs/zfs-tests/tests/| |g' | $COLOR)
3032
if [ -z "$CLINE" ]; then
3133
printf "vm${ID}: %s\n" "$LINE"

0 commit comments

Comments
 (0)