From 5f32d2a438f063ef4f82c0cd441f3e88cbab990e Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Fri, 11 Jun 2021 16:44:55 +0100
Subject: [PATCH] ci: Consistent pass/fail result output

One less point of differentiation.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>
---
 .gitlab-ci/bare-metal/cros_servo_run.py |  2 +-
 .gitlab-ci/bare-metal/fastboot_run.py   |  2 +-
 .gitlab-ci/bare-metal/poe_run.py        |  2 +-
 .gitlab-ci/common/init-stage2.sh        | 11 +++--------
 .gitlab-ci/lava/lava.yml.jinja2         |  9 ++++-----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci/bare-metal/cros_servo_run.py b/.gitlab-ci/bare-metal/cros_servo_run.py
index dc5014b..8b3b807 100755
--- a/.gitlab-ci/bare-metal/cros_servo_run.py
+++ b/.gitlab-ci/bare-metal/cros_servo_run.py
@@ -139,7 +139,7 @@ class CrosServoRun:
                 self.print_error("Detected cheza power management bus error, restarting run...")
                 return 2
 
-            result = re.search("bare-metal result: (\S*)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
                     return 0
diff --git a/.gitlab-ci/bare-metal/fastboot_run.py b/.gitlab-ci/bare-metal/fastboot_run.py
index 3e96629..8b9ce1d 100755
--- a/.gitlab-ci/bare-metal/fastboot_run.py
+++ b/.gitlab-ci/bare-metal/fastboot_run.py
@@ -83,7 +83,7 @@ class FastbootRun:
                     "Detected kernel soft lockup, restarting run...")
                 return 2
 
-            result = re.search("bare-metal result: (\S*)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
                     return 0
diff --git a/.gitlab-ci/bare-metal/poe_run.py b/.gitlab-ci/bare-metal/poe_run.py
index 6a1a92d..f22b90d 100755
--- a/.gitlab-ci/bare-metal/poe_run.py
+++ b/.gitlab-ci/bare-metal/poe_run.py
@@ -66,7 +66,7 @@ class PoERun:
                 self.print_error("Memory overflow in the binner; GPU hang")
                 return 1
 
-            result = re.search("bare-metal result: (\S*)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
                     return 0
diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 3f5207d..346574d 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -45,10 +45,9 @@ if [ -n "$BM_START_XORG" ]; then
   export DISPLAY=:0
 fi
 
+RESULT=fail
 if sh $BARE_METAL_TEST_SCRIPT; then
-  OK=1
-else
-  OK=0
+  RESULT=pass
 fi
 
 # upload artifacts via webdav
@@ -57,8 +56,4 @@ if [ -n "$WEBDAV" ]; then
   find /results -type f -exec curl -T {} $WEBDAV/{} \;
 fi
 
-if [ $OK -eq 1 ]; then
-    echo "bare-metal result: pass"
-else
-    echo "bare-metal result: fail"
-fi
+echo "hwci: mesa: $RESULT"
diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
index b83b200..585263a 100644
--- a/.gitlab-ci/lava/lava.yml.jinja2
+++ b/.gitlab-ci/lava/lava.yml.jinja2
@@ -128,10 +128,9 @@ actions:
                export DISPLAY=:0;
              fi"
 
-          - "if sh $LAVA_TEST_SCRIPT; then
+          - "export RESULT=fail;
+	     if sh $LAVA_TEST_SCRIPT; then
                   export RESULT=pass;
-             else
-                  export RESULT=fail;
              fi"
 
           - "if [ -d results ]; then
@@ -140,9 +139,9 @@ actions:
                 ci-fairy minio cp results.tar.gz minio://${JOB_ARTIFACTS_BASE}/results.tar.gz;
              fi"
 
-          - "echo mesa: $RESULT"
+          - "echo hwci: mesa: $RESULT"
         parse:
-          pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
+          pattern: 'hwci: (?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
       from: inline
       name: mesa
       path: inline/mesa.yaml
-- 
2.7.4