From 2aca1b7f9bcfa4cfa943ae0eb3e5fbe8e3329523 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 8 Apr 2020 12:10:24 -0600 Subject: 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 --- contrib/cirrus/logformatter | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 6a86f6a49..738d2e19d 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("%s", $2, $line); + } $line = "$line"; } -- cgit v1.2.3-54-g00ecf From e394ff407c70d1f54ebe9d41778b80db88c3e3b9 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 15 Apr 2020 12:24:48 -0400 Subject: Cirrus: Fix gate container build failure Signed-off-by: Chris Evich --- contrib/gate/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 54bd2cbde..4fddae557 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 \ -- cgit v1.2.3-54-g00ecf