summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-03-16 08:53:15 -0600
committerEd Santiago <santiago@redhat.com>2020-03-16 11:37:27 -0600
commit3003384785d190133b0e1f483990c0c174a76bac (patch)
tree6b43a14cf131e9a4553b2b36f4445291d5914ca2 /contrib/cirrus
parent67a985ddb25b9bd4786f5081d467ba51f9da4b32 (diff)
downloadpodman-3003384785d190133b0e1f483990c0c174a76bac.tar.gz
podman-3003384785d190133b0e1f483990c0c174a76bac.tar.bz2
podman-3003384785d190133b0e1f483990c0c174a76bac.zip
Four small CI fixes:
1) 'podman system info' (in logcollector): has been silently failing in special_testing_rootless, with: logcollector.sh: line 16: podman: command not found Use ./bin/podman instead of just podman; this is probably the right thing to do in the general case anyway 2) logformatter: highlight 'panic:', seen in bindings test: https://storage.googleapis.com/cirrus-ci-5385732420009984-fcae48/artifacts/containers/libpod/6693715108429824/html/integration_test.log.html 3) logformatter: handle Unicode bullet in front of 'Running', seen in bindings test. 4) logformatter: turn down contrast on BATS 'ok' results, for legibility Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/logcollector.sh2
-rwxr-xr-xcontrib/cirrus/logformatter8
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;
}