ci/baremetal: fix logic for retrying boot when it failed

Contrary to what the original commit said, this is actually still used
(see .gitlab-ci/bare-metal/poe-powered.sh:205), and the boot retry logic
has been broken ever since, exacerbating the rpi farm boot problems.

Fixes: 97b2afa16a ("ci/bare-metal: Drop the 2 vs 1 exit code from poe_run.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30340>
(cherry picked from commit 2bc82b7147)
This commit is contained in:
Eric Engestrom 2024-07-24 11:42:28 +02:00 committed by Eric Engestrom
parent 5b1a063901
commit f3bc003507
2 changed files with 2 additions and 2 deletions

View file

@ -64,7 +64,7 @@ class PoERun:
if not boot_detected:
self.print_error(
"Something wrong; couldn't detect the boot start up sequence")
return 1
return 2
self.logger.create_job_phase("test")
for line in self.ser.lines(timeout=self.test_timeout, phase="test"):

View file

@ -1064,7 +1064,7 @@
"description": "ci/baremetal: fix logic for retrying boot when it failed",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "97b2afa16aeeceff53fb43f657d4bfb8928682b1",
"notes": null