From f3bc0035071cd55f8eb2464e33d5be0578d6e58b Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 24 Jul 2024 11:42:28 +0200 Subject: [PATCH] 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: 97b2afa16aeeceff53fb ("ci/bare-metal: Drop the 2 vs 1 exit code from poe_run.") Part-of: (cherry picked from commit 2bc82b7147cc598d1b210d0dcbc5697a5f3a49b1) --- .gitlab-ci/bare-metal/poe_run.py | 2 +- .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/bare-metal/poe_run.py b/.gitlab-ci/bare-metal/poe_run.py index 0220acad545..98e5d4e35d2 100755 --- a/.gitlab-ci/bare-metal/poe_run.py +++ b/.gitlab-ci/bare-metal/poe_run.py @@ -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"): diff --git a/.pick_status.json b/.pick_status.json index 5f6c754327e..664a9c853c4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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