The whole point of SBSA_REF is for testing firmware which by definition requires TCG. This means the configuration of:
--disable-tcg --with-devices-aarch64=minimal makes no sense (and indeed is broken for the ubuntu-24.04-aarch64-notcg) test. Drop it from minimal and remove the allow_failure from the test case. Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> diff --git a/configs/devices/aarch64-softmmu/minimal.mak b/configs/devices/aarch64-softmmu/minimal.mak index 0ebc1dca561..3c8582e12cc 100644 --- a/configs/devices/aarch64-softmmu/minimal.mak +++ b/configs/devices/aarch64-softmmu/minimal.mak @@ -6,4 +6,3 @@ # CONFIG_ARM_VIRT=y -CONFIG_SBSA_REF=y diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml index 46db9ae0138..ee13587d99e 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml @@ -107,7 +107,5 @@ ubuntu-24.04-aarch64-notcg: rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual - allow_failure: true - if: "$AARCH64_RUNNER_AVAILABLE" when: manual - allow_failure: true -- 2.47.3
