opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-16 18:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5515 from edsantiago/ci_sundry_small_fixes

Browse Source 
Four small CI fixes:
This commit is contained in:
OpenShift Merge Robot
2020-03-16 20:47:07 +01:00
committed by GitHub
parent da17fbaad5 3003384785
commit 2b2996d09d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cirrus/logcollector.sh
View File

@ -32,7 +32,7 @@ case $1 in
df) showrun df -lhTx tmpfs ;; df) showrun df -lhTx tmpfs ;;
ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;; ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;;
journal) showrun journalctl -b ;; journal) showrun journalctl -b ;;
podman) showrun podman system info ;; podman) showrun ./bin/podman system info ;;
varlink) varlink)
if [[ "$TEST_REMOTE_CLIENT" == "true" ]] if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
then then

8
contrib/cirrus/logformatter
View File

@ -52,7 +52,7 @@ a.codelink:hover { background: #000; color: #999; }
a.timing { text-decoration: none; } a.timing { text-decoration: none; }
/* BATS styles */ /* BATS styles */
.bats-ok { color: #3f3; } .bats-ok { color: #393; }
.bats-notok { color: #F00; font-weight: bold; } .bats-notok { color: #F00; font-weight: bold; }
.bats-skip { color: #F90; } .bats-skip { color: #F90; }
.bats-log { color: #900; } .bats-log { color: #900; }
@ -286,7 +286,8 @@ END_HTML
$previous_timestamp = ''; $previous_timestamp = '';
next LINE; next LINE;
} }
elsif ($line =~ /^Running:/) { # (bindings test sometimes emits 'Running' with leading bullet char)
elsif ($line =~ /^•?Running:/) {
# Highlight the important (non-boilerplate) podman command. # Highlight the important (non-boilerplate) podman command.
# Strip out the global podman options, but show them on hover # 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+)*)(.*)}{ $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) /) { elsif ($line =~ /^Error:/ || $line =~ / level=(warning|error) /) {
$line = "<span class='log-warn'>" . $line . "</span>"; $line = "<span class='log-warn'>" . $line . "</span>";
} }
elsif ($line =~ /^panic:/) {
$line = "<span class='log-error'>" . $line . "</span>";
}
else { else {
$current_output .= ' ' . $line; $current_output .= ' ' . $line;
} }