From e34a2e893d3fdea690b90411c08985194b4fbfd4 Mon Sep 17 00:00:00 2001
From: Alex Tercete <alex.tercete@arm.com>
Date: Wed, 20 Nov 2024 09:43:50 +0000
Subject: [PATCH 1/2] feat: test hangs

---
 e2e/qemu/BUILD.bazel | 7 +++++++
 labgrid/run/run.py   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/e2e/qemu/BUILD.bazel b/e2e/qemu/BUILD.bazel
index 220e81cd..f09c122e 100644
--- a/e2e/qemu/BUILD.bazel
+++ b/e2e/qemu/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@rules_diff//diff/file/test:defs.bzl", "diff_file_test")
 load("@rules_labgrid//labgrid/run:defs.bzl", "labgrid_run")
+load("@rules_labgrid//labgrid/test:defs.bzl", "labgrid_test")
 
 CPUS = ("amd64", "arm64")
 
@@ -28,3 +29,9 @@ test_suite(
     name = "run",
     tests = ["run-{}".format(cpu) for cpu in CPUS],
 )
+
+labgrid_test(
+    name = "test",
+    src = "@ape//ape:env",
+    platform = "@rules_labgrid//platform:qemu-arm64-linux",
+)
diff --git a/labgrid/run/run.py b/labgrid/run/run.py
index 831ae8e9..e5b7a958 100644
--- a/labgrid/run/run.py
+++ b/labgrid/run/run.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 from typing import Any
 
+import logging
+
+from labgrid.logging import basicConfig, StepLogger
 from argparse import REMAINDER, Action, ArgumentParser, ArgumentTypeError, Namespace
 from dataclasses import dataclass, replace
 from os import environ, linesep, getenv
@@ -30,6 +33,7 @@ from labgrid import Environment
 from labgrid.driver.exception import ExecutionError
 
 T = TypeVar("T")
+logger = logging.getLogger(__name__)
 
 
 class RunfileNotFoundError(FileNotFoundError):
@@ -242,6 +246,9 @@ def run(
         del environ["RUNFILES_DIR"]
     except KeyError:
         pass
+
+    basicConfig(level=logging.DEBUG)
+    StepLogger.start()
     # Start up Docker container with LabGrid
     target = Environment(str(config)).get_target()
     strategy = target.get_driver("Strategy")
-- 
GitLab


From bd09766c235c116bc9055c2ac3d02691055469f2 Mon Sep 17 00:00:00 2001
From: Omri Ifergan <omri.ifergan@arm.com>
Date: Thu, 21 Nov 2024 08:37:53 +0000
Subject: [PATCH 2/2] test: qemu-system-aarch64 on x86_64 host

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ee744e9..36612d03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ include:
 
 default:
   tags:
-    - arm64
+    - amd64
 
 oci:
   stage: .pre
-- 
GitLab