mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
logformatter: handle podman-remote
Oops! Logs of podman-remote tests are unreadable, they have multiple (useless) --remote options plus '--url /something/long' that makes it impossible to read the actual command being run. This commit strips off '--remote' entirely, and hides '--url' and its arg in the only-on-mouse-hover '[options]' text. Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
parent
80add2902c
commit
0e85768c96
|
@ -303,14 +303,15 @@ END_HTML
|
|||
# (bindings test sometimes emits 'Running' with leading bullet char)
|
||||
elsif ($line =~ /^•?Running:/) {
|
||||
# Highlight the important (non-boilerplate) podman command.
|
||||
$line =~ s/\s+--remote\s+/ /g; # --remote takes no args
|
||||
# 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+)*)(.*)}{
|
||||
my ($full_path, $options, $args) = ($1, $2, $5);
|
||||
$line =~ s{(\S+\/podman(-remote)?)((\s+--(root|runroot|runtime|tmpdir|storage-opt|conmon|cgroup-manager|cni-config-dir|storage-driver|events-backend|url) \S+)*)(.*)}{
|
||||
my ($full_path, $remote, $options, $args) = ($1, $2||'', $3, $6);
|
||||
|
||||
$options =~ s/^\s+//;
|
||||
# Separate each '--foo bar' with newlines for readability
|
||||
$options =~ s/ --/\n--/g;
|
||||
qq{<span title="$full_path"><b>podman</b></span> <span class=\"boring\" title=\"$options\">[options]</span><b>$args</b>};
|
||||
qq{<span title="$full_path"><b>podman$remote</b></span> <span class=\"boring\" title=\"$options\">[options]</span><b>$args</b>};
|
||||
}e;
|
||||
$current_output = '';
|
||||
}
|
||||
|
|
|
@ -132,6 +132,8 @@ $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}
|
|||
[+0103s] /var/tmp/go/src/github.com/containers/libpod/test/e2e/pod_restart_test.go:28
|
||||
[+0103s] Running: /var/tmp/go/src/github.com/containers/libpod/bin/podman --storage-opt vfs.imagestore=/tmp/podman/imagecachedir --root /tmp/podman_test553496330/crio --runroot /tmp/podman_test553496330/crio-run --runtime /usr/bin/runc --conmon /usr/bin/conmon --cni-config-dir /etc/cni/net.d --cgroup-manager systemd --tmpdir /tmp/podman_test553496330 --events-backend file --storage-driver vfs pod rm -fa
|
||||
[+0103s] 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89
|
||||
[+0104s] Running: /var/tmp/go/src/github.com/containers/libpod/bin/podman-remote --storage-opt vfs.imagestore=/tmp/podman/imagecachedir --root /tmp/podman_test553496330/crio --runroot /tmp/podman_test553496330/crio-run --runtime /usr/bin/runc --conmon /usr/bin/conmon --cni-config-dir /etc/cni/net.d --cgroup-manager systemd --tmpdir /tmp/podman_test553496330 --events-backend file --storage-driver vfs --remote --url unix:/run/user/12345/podman-xyz.sock pod rm -fa
|
||||
[+0104s] 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 again
|
||||
[+0107s] •
|
||||
[+0107s] ------------------------------
|
||||
[+0107s] podman system reset
|
||||
|
@ -186,6 +188,21 @@ $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}
|
|||
--events-backend file
|
||||
--storage-driver vfs">[options]</span><b> pod rm -fa</b>
|
||||
<span class="timestamp"> </span>4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89
|
||||
|
||||
<span class="timestamp">[+0104s] </span>Running: <span title="/var/tmp/go/src/github.com/containers/libpod/bin/podman-remote"><b>podman-remote</b></span> <span class="boring" title="--storage-opt vfs.imagestore=/tmp/podman/imagecachedir
|
||||
--root /tmp/podman_test553496330/crio
|
||||
--runroot /tmp/podman_test553496330/crio-run
|
||||
--runtime /usr/bin/runc
|
||||
--conmon /usr/bin/conmon
|
||||
--cni-config-dir /etc/cni/net.d
|
||||
--cgroup-manager systemd
|
||||
--tmpdir /tmp/podman_test553496330
|
||||
--events-backend file
|
||||
--storage-driver vfs
|
||||
--url unix:/run/user/12345/podman-xyz.sock">[options]</span><b> pod rm -fa</b>
|
||||
<span class="timestamp"> </span>4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 again
|
||||
|
||||
|
||||
<span class="timestamp">[+0107s] </span>•
|
||||
</pre>
|
||||
<hr />
|
||||
|
|
Loading…
Reference in a new issue