diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ee744e9e2bd2ce69432967c1b1044f01a635000..36612d034ce5ce15fcaabc6a2eac1c30c9b00894 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ include: default: tags: - - arm64 + - amd64 oci: stage: .pre diff --git a/e2e/qemu/BUILD.bazel b/e2e/qemu/BUILD.bazel index 220e81cd549da52a4ca3a91e782222f9d31cdb79..f09c122e20e62417efc3a4086d1812217da30f36 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 831ae8e95e16a05ff2f2cfcef3d8fd3fefcef53e..e5b7a95841e44ca4dc295a7cf0794ec841322616 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")