From a921aabed56faa2210df4346c757ef73be170504 Mon Sep 17 00:00:00 2001 From: Pierrick Bouvier Date: Wed, 10 Jun 2026 12:22:21 -0700 Subject: [PATCH] ci: update to ubuntu2404 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/qemu-devel/20260610192222.2709135-5-pierrick.bouvier@oss.qualcomm.com Signed-off-by: Pierrick Bouvier --- .gitlab-ci.d/buildtest.yml | 16 ++++++++-------- .gitlab-ci.d/containers.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d054349030..e2553e7326 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -36,9 +36,9 @@ build-system-ubuntu: - .native_build_job_template - .native_build_artifact_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-docs --enable-rust TARGETS: alpha-softmmu microblaze-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build @@ -49,7 +49,7 @@ check-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 MAKE_CHECK_ARGS: check functional-system-ubuntu: @@ -58,7 +58,7 @@ functional-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 MAKE_CHECK_ARGS: check-functional build-system-debian: @@ -577,9 +577,9 @@ functional-cfi-x86_64: tsan-build: extends: .native_build_job_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-tsan --cc=clang --cxx=clang++ --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user @@ -591,10 +591,10 @@ tsan-build: gcov: extends: .native_build_job_template needs: - - job: amd64-ubuntu2204-container + - job: amd64-ubuntu2404-container timeout: 80m variables: - IMAGE: ubuntu2204 + IMAGE: ubuntu2404 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check-unit check-softfloat diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 515e7382f2..87c20094d2 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -13,10 +13,10 @@ amd64-debian-container: variables: NAME: debian -amd64-ubuntu2204-container: +amd64-ubuntu2404-container: extends: .container_job_template variables: - NAME: ubuntu2204 + NAME: ubuntu2404 amd64-opensuse-leap-container: extends: .container_job_template @@ -58,7 +58,7 @@ weekly-container-builds: # containers - amd64-alpine-container - amd64-debian-container - - amd64-ubuntu2204-container + - amd64-ubuntu2404-container - amd64-opensuse-leap-container - python-container - amd64-fedora-rust-nightly-container