From 12e9a13e32662f2b9abce1fc34a89b0786280328 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20Benn=C3=A9e?= Date: Mon, 27 Oct 2025 11:03:40 +0000 Subject: [PATCH] configs: drop SBSA_REF from minimal specification MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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é Message-ID: <20251027110344.2289945-34-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml | 2 -- configs/devices/aarch64-softmmu/minimal.mak | 1 - 2 files changed, 3 deletions(-) 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 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 -- 2.47.3