From ef4e75e5ab78e176dd4b7dfceb5a56857b22cdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 24 Jun 2026 13:46:54 +0100 Subject: [PATCH] gitlab: use .base_meson_job_template from crossbuild jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that crossbuild jobs capture the build/meson-logs content as artifacts to aid in debugging. Signed-off-by: Daniel P. Berrangé Reviewed-by: Pierrick Bouvier Link: https://lore.kernel.org/qemu-devel/20260624124657.2725376-4-berrange@redhat.com Signed-off-by: Pierrick Bouvier --- .gitlab-ci.d/crossbuild-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 786c5cdb88..36bb9a405c 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -1,5 +1,5 @@ .cross_system_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: @@ -54,7 +54,7 @@ # KVM), and set extra options (such disabling other accelerators) via the # $EXTRA_CONFIGURE_OPTS variable. .cross_accel_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG timeout: 60m @@ -87,7 +87,7 @@ - section_end test .cross_user_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: