From 50298e9b64bf374d22f6cd123728306e31bbb7e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <petr.stetiar@prplfoundation.org>
Date: Thu, 9 Oct 2025 12:00:53 +0000
Subject: [PATCH] ci: testbed-device.py: improve error reporting during the
 board bringup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently when something goes wrong during labgrid DUT bringup
procedure, we get a stack trace, but it would be helpful to get serial
console log as well. So lets handle the possible exception and dump the
serial console output, so it doesn't get lost.

References: FEAT-67
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
---
 .gitlab/scripts/testbed-device.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/.gitlab/scripts/testbed-device.py b/.gitlab/scripts/testbed-device.py
index 97efc6e47e..76e0cef553 100755
--- a/.gitlab/scripts/testbed-device.py
+++ b/.gitlab/scripts/testbed-device.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
 import argparse
+import glob
 import os
 import sys
 import logging
 import json
 import time
+import traceback
 
 from labgrid import Environment, StepReporter
 from labgrid.driver import ExecutionError
@@ -207,6 +209,27 @@ class TestbedDevice:
         shell.wait_for("ping -c1 {} || true".format(host), ", 0% packet loss", 180.0)
 
 
+def handle_exception_dump_console(args):
+    """Handle exception by printing stack trace and dumping console logs"""
+    logging.error("An error occurred during execution")
+    logging.error("=" * 80)
+    logging.error("Stack trace:")
+    traceback.print_exc()
+    logging.error("=" * 80)
+    logging.error("Console log dump:")
+
+    console_log_pattern = os.path.join(args.console_logpath, "console_*")
+    console_log_files = glob.glob(console_log_pattern)
+    if console_log_files:
+        console_log_file = max(console_log_files, key=os.path.getctime)
+        with open(console_log_file, "r") as f:
+            logging.error(f.read())
+    else:
+        logging.error("Console log file not found or not available")
+    logging.error("=" * 80)
+    sys.exit(1)
+
+
 def main():
     logging.basicConfig(
         level=logging.INFO, format="%(levelname)7s: %(message)s", stream=sys.stderr
@@ -310,8 +333,11 @@ def main():
         print("command is missing")
         exit(1)
 
-    device = TestbedDevice(args)
-    args.func(device)
+    try:
+        device = TestbedDevice(args)
+        args.func(device)
+    except Exception as e:
+        handle_exception_dump_console(args)
 
 
 if __name__ == "__main__":