Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Pierrick Bouvier <[email protected]>
---
.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 d0543490309..e2553e7326f 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 515e7382f26..87c20094d22 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
--
2.43.0
