From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>
Subject: [PULL 06/17] gitlab: move custom runners to Ubuntu 24.04
Date: Tue, 7 Oct 2025 12:55:14 +0100 [thread overview]
Message-ID: <20251007115525.1998643-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20251001170947.2769296-7-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 2d493f70f7a..3eb8216d571 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -29,6 +29,6 @@
junit: build/meson-logs/*.junit.xml
include:
- - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml'
- - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
- - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml'
+ - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml'
+ - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml'
+ - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
similarity index 78%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
index 8727687e2b4..75029c9187e 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
-# "Install basic packages to build QEMU on Ubuntu 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
-ubuntu-22.04-aarch32-all:
+ubuntu-24.04-aarch32-all:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch32
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
similarity index 89%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
index ca2f1404710..d26c7827f45 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
-# "Install basic packages to build QEMU on Ubuntu 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
-ubuntu-22.04-aarch64-all-linux-static:
+ubuntu-24.04-aarch64-all-linux-static:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -23,12 +23,12 @@ ubuntu-22.04-aarch64-all-linux-static:
- make check-tcg
- make --output-sync -j`nproc --ignore=40` check
-ubuntu-22.04-aarch64-all:
+ubuntu-24.04-aarch64-all:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -45,12 +45,12 @@ ubuntu-22.04-aarch64-all:
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
-ubuntu-22.04-aarch64-without-defaults:
+ubuntu-24.04-aarch64-without-defaults:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -67,12 +67,12 @@ ubuntu-22.04-aarch64-without-defaults:
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
-ubuntu-22.04-aarch64-alldbg:
+ubuntu-24.04-aarch64-alldbg:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -86,12 +86,12 @@ ubuntu-22.04-aarch64-alldbg:
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
-ubuntu-22.04-aarch64-clang:
+ubuntu-24.04-aarch64-clang:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -108,11 +108,11 @@ ubuntu-22.04-aarch64-clang:
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
-ubuntu-22.04-aarch64-tci:
+ubuntu-24.04-aarch64-tci:
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -128,12 +128,12 @@ ubuntu-22.04-aarch64-tci:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
-ubuntu-22.04-aarch64-notcg:
+ubuntu-24.04-aarch64-notcg:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
similarity index 88%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
index e62ff1763fa..45dbee17880 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
-# "Install basic packages to build QEMU on Ubuntu 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
-ubuntu-22.04-s390x-all-linux:
+ubuntu-24.04-s390x-all-linux:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -21,12 +21,12 @@ ubuntu-22.04-s390x-all-linux:
- make --output-sync check-tcg
- make --output-sync -j`nproc` check
-ubuntu-22.04-s390x-all-system:
+ubuntu-24.04-s390x-all-system:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
timeout: 75m
rules:
@@ -42,12 +42,12 @@ ubuntu-22.04-s390x-all-system:
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
-ubuntu-22.04-s390x-alldbg:
+ubuntu-24.04-s390x-alldbg:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -65,12 +65,12 @@ ubuntu-22.04-s390x-alldbg:
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
-ubuntu-22.04-s390x-clang:
+ubuntu-24.04-s390x-clang:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -87,11 +87,11 @@ ubuntu-22.04-s390x-clang:
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
-ubuntu-22.04-s390x-tci:
+ubuntu-24.04-s390x-tci:
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -107,12 +107,12 @@ ubuntu-22.04-s390x-tci:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
-ubuntu-22.04-s390x-notcg:
+ubuntu-24.04-s390x-notcg:
extends: .custom_runner_template
needs: []
stage: build
tags:
- - ubuntu_22.04
+ - ubuntu_24.04
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
--
2.47.3
next prev parent reply other threads:[~2025-10-07 12:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-07 11:55 [PULL 00/17] testing updates Alex Bennée
2025-10-07 11:55 ` [PULL 01/17] .gitpublish: use origin/master as default base Alex Bennée
2025-10-07 11:55 ` [PULL 02/17] .gitmodules: restore qemu-project mirror of u-boot Alex Bennée
2025-10-07 11:55 ` [PULL 03/17] .gitmodules: restore qemu-project mirror of u-boot-sam460ex Alex Bennée
2025-10-07 11:55 ` [PULL 04/17] tests/lcitool: drop 64 bit guests from i686 cross build Alex Bennée
2025-10-07 11:55 ` [PULL 05/17] tests/lcitool: bump custom runner packages to Ubuntu 24.04 Alex Bennée
2025-10-07 11:55 ` Alex Bennée [this message]
2025-10-07 11:55 ` [PULL 07/17] scripts/ci: use recommended registration command Alex Bennée
2025-10-07 11:55 ` [PULL 08/17] tests/functional: Re-activate the check-venv target Alex Bennée
2025-10-07 11:55 ` [PULL 09/17] python: Install pygdbmi in meson's venv Alex Bennée
2025-10-07 11:55 ` [PULL 10/17] tests/functional: Provide GDB to the functional tests Alex Bennée
2025-10-07 11:55 ` [PULL 11/17] tests/functional: Add GDB class Alex Bennée
2025-10-07 11:55 ` [PULL 12/17] tests/functional: replace avocado process with subprocess Alex Bennée
2025-10-07 11:55 ` [PULL 13/17] tests/functional: drop datadrainer class in reverse debugging Alex Bennée
2025-10-07 11:55 ` [PULL 14/17] tests/functional: Add decorator to skip test on missing env vars Alex Bennée
2025-10-07 11:55 ` [PULL 15/17] tests/functional: Adapt reverse_debugging to run w/o Avocado Alex Bennée
2025-10-07 11:55 ` [PULL 16/17] tests/functional: Adapt arches to reverse_debugging " Alex Bennée
2025-10-07 11:55 ` [PULL 17/17] record/replay: fix race condition on test_aarch64_reverse_debug Alex Bennée
2025-10-07 22:58 ` [PULL 00/17] testing updates Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251007115525.1998643-7-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).