Module: Mesa Branch: staging/23.3 Commit: 1c1382b30428f541849b8691d3997d775309a3f3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c1382b30428f541849b8691d3997d775309a3f3
Author: Daniel Stone <[email protected]> Date: Fri Nov 3 15:50:58 2023 +0000 ci: Try really hard to print final result string a630 has been completing jobs, and then corrupting the very last line of UART output - the one where we pass the overall result back from the DUT to the job. The bare-metal monitor will wait for this line to appear, never see it, and then the job times out. Since this line is the most critical one of all to get out, just spam the prints to try to make sure they get through. Signed-off-by: Daniel Stone <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26032> (cherry picked from commit 80b87c18d1630dd622bf58e56f3fb3f39e9fb8ef) --- .gitlab-ci/common/init-stage2.sh | 10 +++++++--- .pick_status.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index bc7717322f0..7440893a667 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -216,7 +216,11 @@ fi [ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail set +x -echo "hwci: mesa: $RESULT" -# Sleep a bit to avoid kernel dump message interleave from LAVA ENDTC signal -sleep 1 + +# Print the final result; both bare-metal and LAVA look for this string to get +# the result of our run, so try really hard to get it out rather than losing +# the run. The device gets shut down right at this point, and a630 seems to +# enjoy corrupting the last line of serial output before shutdown. +for _ in $(seq 0 3); do echo "hwci: mesa: $RESULT"; sleep 1; echo; done + exit $EXIT_CODE diff --git a/.pick_status.json b/.pick_status.json index e9283e286a8..7012bfe3a7a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -624,7 +624,7 @@ "description": "ci: Try really hard to print final result string", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null
