From 2aca1b7f9bcfa4cfa943ae0eb3e5fbe8e3329523 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Wed, 8 Apr 2020 12:10:24 -0600
Subject: [PATCH 1/2] logformat: handle apiv2 results, add anchor links

apiv2 tests emit TAP-compliant output; recognize it and
highlight it the same way we do BATS tests.

Add anchor links to TAP output, so other tools (e.g.
cirrus-flake-summarize) can link to particular lines

And, remove a "-f" from "wait" in test-apiv2; looks
like there's some version of bash used in some CI VM
that doesn't grok it.

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

diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index 6a86f6a498..738d2e19de 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -220,8 +220,8 @@ END_HTML
             $cirrus_task = $1;
         }
 
-        # BATS handling
-        if ($line =~ /^1\.\.\d+$/) {
+        # BATS handling (used also for apiv2 tests, which emit TAP output)
+        if ($line =~ /^1\.\.\d+$/ || $line =~ m!/test-apiv2!) {
             $looks_like_bats = 1;
         }
         if ($looks_like_bats) {
@@ -234,6 +234,10 @@ END_HTML
             elsif ($line =~ /^#\s/)            { $css = 'log'     }
 
             if ($css) {
+                # Make it linkable, e.g. foo.html#t--00001
+                if ($line =~ /^(not\s+)?ok\s+(\d+)/) {
+                    $line = sprintf("<a name='t--%05d'>%s</a>", $2, $line);
+                }
                 $line = "<span class='bats-$css'>$line</span>";
             }
 
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2
index b101be0128..1af76b4bed 100755
--- a/test/apiv2/test-apiv2
+++ b/test/apiv2/test-apiv2
@@ -355,7 +355,7 @@ done
 
 if [ -n "$service_pid" ]; then
     kill $service_pid
-    wait -f $service_pid
+    wait $service_pid
 fi
 
 test_count=$(<$testcounter_file)

From e394ff407c70d1f54ebe9d41778b80db88c3e3b9 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 15 Apr 2020 12:24:48 -0400
Subject: [PATCH 2/2] Cirrus: Fix gate container build failure

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 contrib/gate/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index 54bd2cbde5..4fddae5576 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -21,6 +21,7 @@ RUN dnf -y install \
       procps-ng \
       python \
       python3-dateutil \
+      python3-pip \
       python3-psutil \
       python3-pytoml \
       python3-pyyaml \