KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel Stone 2021-06-11 16:44:55 +01:00 committed by Tomeu Vizoso
parent 0723692a21
commit 5f32d2a438
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/bare-metal/cros_servo_run.py
View File

@ -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

2
.gitlab-ci/bare-metal/fastboot_run.py
View File

@ -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

2
.gitlab-ci/bare-metal/poe_run.py
View File

@ -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

11
.gitlab-ci/common/init-stage2.sh
View File

@ -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"

9
.gitlab-ci/lava/lava.yml.jinja2
View File

@ -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