containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logformatter: handle Windows logs 

C-colon and backslashes and ^Ms oh my

Tested on sample failure and success logs, seems to work.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2024-03-18 14:39:44 -06:00
parent 8a643c243e
commit f16ab115ed
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/cirrus/logformatter
View File

@ -327,6 +327,11 @@ END_HTML
# 1 123 3 4 425 5 # 1 123 3 4 425 5
$line =~ s{^(.*/ci/task-\d+)((/\S+):(\d+))(.*)$} $line =~ s{^(.*/ci/task-\d+)((/\S+):(\d+))(.*)$}
{$1<a class="codelink" href="https://github.com/containers/podman/blob/$git_commit$3#L$4">$2</a>$5}; {$1<a class="codelink" href="https://github.com/containers/podman/blob/$git_commit$3#L$4">$2</a>$5};
# ...as does Windows
# 1 123 3 4 435 5
$line =~ s{^(.*/Local/cirrus-ci-build/repo)((/\S+):(\d+))(.*)$}
{$1<a class="codelink" href="https://github.com/containers/podman/blob/$git_commit$3#L$4">$2</a>$5}
} }
# Try to identify the cirrus task # Try to identify the cirrus task
@ -603,6 +608,11 @@ END_HTML
$current_output = ''; $current_output = '';
} }
# Windows
# 1 12 2 3 3
elsif ($line =~ /^(\s*)(C:\\Users.*\\podman\.exe)\s(.*)$/) {
$line = qq{$1C&gt; <span title="$2"><b>podman.exe</b></span> <b>$3</b>};
}
elsif ($line =~ /^\s*Error:/ || $line =~ / level=(warning|error) /) { elsif ($line =~ /^\s*Error:/ || $line =~ / level=(warning|error) /) {
$line = "<span class='log-warning'>" . $line . "</span>"; $line = "<span class='log-warning'>" . $line . "</span>";
} }
@ -660,7 +670,7 @@ END_HTML
# https://onsi.github.io/ginkgo/#generating-reports-programmatically # https://onsi.github.io/ginkgo/#generating-reports-programmatically
$after_divider = 999; $after_divider = 999;
} }
elsif ($line =~ m!^\s*/\S+!) { elsif ($line =~ m!^\s*(/\S+|C:/)!) {
# Source code path: skip # Source code path: skip
} }
elsif ($line =~ /<b/) { elsif ($line =~ /<b/) {
@ -801,6 +811,7 @@ sub make_id {
state %counter; state %counter;
$name =~ s/\r//g; # strip windows ^Ms
$name =~ s/^\s+|\s+$//g; # strip leading/trailing whitespace $name =~ s/^\s+|\s+$//g; # strip leading/trailing whitespace
$name =~ s/^\[It\]\s*//; # strip leading "[It] " $name =~ s/^\[It\]\s*//; # strip leading "[It] "
$name =~ s/\&#\d+;//g; # 'doesn&#39;t' -> 'doesnt' $name =~ s/\&#\d+;//g; # 'doesn&#39;t' -> 'doesnt'