diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/logcollector.sh | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/logformatter | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh index 34b88e6ea..e0190971e 100755 --- a/contrib/cirrus/logcollector.sh +++ b/contrib/cirrus/logcollector.sh @@ -32,7 +32,7 @@ case $1 in df) showrun df -lhTx tmpfs ;; ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;; journal) showrun journalctl -b ;; - podman) showrun podman system info ;; + podman) showrun ./bin/podman system info ;; varlink) if [[ "$TEST_REMOTE_CLIENT" == "true" ]] then diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 4cc4480f5..6a86f6a49 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -52,7 +52,7 @@ a.codelink:hover { background: #000; color: #999; } a.timing { text-decoration: none; } /* BATS styles */ -.bats-ok { color: #3f3; } +.bats-ok { color: #393; } .bats-notok { color: #F00; font-weight: bold; } .bats-skip { color: #F90; } .bats-log { color: #900; } @@ -286,7 +286,8 @@ END_HTML $previous_timestamp = ''; next LINE; } - elsif ($line =~ /^Running:/) { + # (bindings test sometimes emits 'Running' with leading bullet char) + elsif ($line =~ /^•?Running:/) { # Highlight the important (non-boilerplate) podman command. # Strip out the global podman options, but show them on hover $line =~ s{(\S+\/podman)((\s+--(root|runroot|runtime|tmpdir|storage-opt|conmon|cgroup-manager|cni-config-dir|storage-driver|events-backend) \S+)*)(.*)}{ @@ -310,6 +311,9 @@ END_HTML elsif ($line =~ /^Error:/ || $line =~ / level=(warning|error) /) { $line = "<span class='log-warn'>" . $line . "</span>"; } + elsif ($line =~ /^panic:/) { + $line = "<span class='log-error'>" . $line . "</span>"; + } else { $current_output .= ' ' . $line; } |