From 82e701a8ee67fb4a9e2954add4f5b32adde3bd62 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 5 Mar 2024 05:46:34 -0700
Subject: [PATCH] logformatter: strip "--url xxx" from bats podman-remote

...it's useless clutter.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 contrib/cirrus/logformatter   | 7 ++++---
 contrib/cirrus/logformatter.t | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index 78ac1850d7..901242f62c 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -426,9 +426,10 @@ END_HTML
             }
 
             # Readability: /long/path/to/podman -> podman (hover for full path)
-            # Also make it boldface, to make commands stand out
-            $line =~ s{^(#\s+(#|\$)\s+)(\S+/)(podman\S*)(\s.*)}
-                      {$1<b><span title="$3$4">$4</span>$5</b>};
+            # Also make it boldface, to make commands stand out, and strip --url
+            #           1    2    2   13    345         56              6 47    7
+            $line =~ s{^(#\s+(#|\$)\s+)(\S+/)((podman\S*)(\s+--url\s+\S+)?)(\s.*)}
+                      {$1<b><span title="$3$4">$5</span>$7</b>};
 
             if    ($line =~ /^ok\s.*\s# skip/)    { $css = 'skipped'       }
             elsif ($line =~ /^ok\s/)              { $css = 'passed'        }
diff --git a/contrib/cirrus/logformatter.t b/contrib/cirrus/logformatter.t
index 0387b8bf48..ed6b962137 100755
--- a/contrib/cirrus/logformatter.t
+++ b/contrib/cirrus/logformatter.t
@@ -96,6 +96,7 @@ not ok 3 fail
 # (from function `assert' in file ./helpers.bash, line 343,
 #  from function `expect_output' in file ./helpers.bash, line 370,
 #  in test file ./run.bats, line 786)
+# $ /path/to/podman-remote --url /this/should/be-stripped blah blah
 # $ /path/to/podman foo -bar
 # time="2023-01-05T15:15:20Z" level=debug msg="this is debug"
 # time="2023-01-05T15:15:20Z" level=warning msg="this is warning"
@@ -109,6 +110,7 @@ ok 4 blah
 <span class='bats-log'># (from function `assert&#39; in file ./<a class="codelink" href="https://github.com/containers/podman/blob/ceci-nest-pas-une-sha/test/system/helpers.bash#L343">helpers.bash, line 343</a>,</span>
 <span class='bats-log'>#  from function `expect_output&#39; in file ./<a class="codelink" href="https://github.com/containers/podman/blob/ceci-nest-pas-une-sha/test/system/helpers.bash#L370">helpers.bash, line 370</a>,</span>
 <span class='bats-log'>#  in test file ./<a class="codelink" href="https://github.com/containers/podman/blob/ceci-nest-pas-une-sha/test/system/run.bats#L786">run.bats, line 786</a>)</span>
+<span class='bats-log'># $ <b><span title="/path/to/podman-remote --url /this/should/be-stripped">podman-remote</span> blah blah</b></span>
 <span class='bats-log'># $ <b><span title="/path/to/podman">podman</span> foo -bar</b></span>
 <span class='bats-log'># time=<span class='log-debug'>&quot;2023-01-05T15:15:20Z&quot;</span> level=<span class='log-debug'>debug</span> msg=<span class='log-debug'>&quot;this is debug&quot;</span></span>
 <span class='bats-log'># time=<span class='log-warning'>&quot;2023-01-05T15:15:20Z&quot;</span> level=<span class='log-warning'>warning</span> msg=<span class='log-warning'>&quot;this is warning&quot;</span></span>