From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Gustavo Romero" <gustavo.romero@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04
Date: Wed, 1 Oct 2025 18:09:45 +0100 [thread overview]
Message-ID: <20251001170947.2769296-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20251001170947.2769296-1-alex.bennee@linaro.org>
In anticipation of new runners lets move to a newer Ubuntu LTS.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
scripts/ci/setup/gitlab-runner.yml | 2 +-
scripts/ci/setup/ubuntu/build-environment.yml | 12 ++++++------
...tu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} | 4 +++-
...ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} | 4 +++-
tests/lcitool/refresh | 4 ++--
5 files changed, 15 insertions(+), 11 deletions(-)
rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)
diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
index 57e7faebf10..7350f6cff4a 100644
--- a/scripts/ci/setup/gitlab-runner.yml
+++ b/scripts/ci/setup/gitlab-runner.yml
@@ -103,7 +103,7 @@
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['architecture'] == 'aarch64'
- - ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['distribution_version'] == '24.04'
- name: Install the gitlab-runner service using its own functionality
command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index 56b51609e38..6042750cb4d 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -35,19 +35,19 @@
# the package lists are updated by "make lcitool-refresh"
- name: Include package lists based on OS and architecture
include_vars:
- file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml"
+ file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- - ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['distribution_version'] == '24.04'
- - name: Install packages for QEMU on Ubuntu 22.04
+ - name: Install packages for QEMU on Ubuntu 24.04
package:
name: "{{ packages }}"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- - ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['distribution_version'] == '24.04'
- - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04
+ - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
package:
name:
- binutils-arm-linux-gnueabihf
@@ -62,6 +62,6 @@
- zlib1g-dev:armhf
when:
- ansible_facts['distribution'] == 'Ubuntu'
- - ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['distribution_version'] == '24.04'
- ansible_facts['architecture'] == 'aarch64'
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
similarity index 96%
rename from scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
rename to scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
index 2ca4a5392f5..ce632d97108 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
@@ -1,12 +1,13 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu
+# $ lcitool variables --host-arch aarch64 ubuntu-2404 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
packages:
- bash
- bc
+ - bindgen
- bison
- bsdextrautils
- bzip2
@@ -92,6 +93,7 @@ packages:
- libvdeplug-dev
- libvirglrenderer-dev
- libvte-2.91-dev
+ - libxdp-dev
- libxen-dev
- libzstd-dev
- llvm
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
similarity index 96%
rename from scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
rename to scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
index 7198fbbcbb7..f45f75c9602 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
@@ -1,12 +1,13 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool variables --host-arch s390x ubuntu-2204 qemu
+# $ lcitool variables --host-arch s390x ubuntu-2404 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
packages:
- bash
- bc
+ - bindgen
- bison
- bsdextrautils
- bzip2
@@ -91,6 +92,7 @@ packages:
- libvdeplug-dev
- libvirglrenderer-dev
- libvte-2.91-dev
+ - libxdp-dev
- libzstd-dev
- llvm
- locales
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 185a47cebe6..056cfb6e9d7 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -270,8 +270,8 @@ try:
#
# Ansible package lists
#
- generate_yaml("ubuntu", "ubuntu-2204", "aarch64")
- generate_yaml("ubuntu", "ubuntu-2204", "s390x")
+ generate_yaml("ubuntu", "ubuntu-2404", "aarch64")
+ generate_yaml("ubuntu", "ubuntu-2404", "s390x")
sys.exit(0)
--
2.47.3
next prev parent reply other threads:[~2025-10-01 17:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-01 17:09 [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab) Alex Bennée
2025-10-01 17:09 ` [PATCH 1/7] .gitpublish: use origin/master as default base Alex Bennée
2025-10-01 17:09 ` [PATCH 2/7] .gitmodules: restore qemu-project mirror of u-boot Alex Bennée
2025-10-01 17:09 ` [PATCH 3/7] .gitmodules: restore qemu-project mirror of u-boot-sam460ex Alex Bennée
2025-10-01 17:09 ` [PATCH 4/7] tests/lcitool: drop 64 bit guests from i686 cross build Alex Bennée
2025-10-01 18:32 ` Marc-André Lureau
2025-10-01 18:41 ` Philippe Mathieu-Daudé
2025-10-01 20:49 ` Richard Henderson
2025-10-01 17:09 ` Alex Bennée [this message]
2025-10-01 20:50 ` [PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04 Richard Henderson
2025-10-02 5:23 ` Thomas Huth
2025-10-02 5:24 ` Philippe Mathieu-Daudé
2025-10-01 17:09 ` [PATCH 6/7] gitlab: move custom runners " Alex Bennée
2025-10-01 20:52 ` Richard Henderson
2025-10-02 5:24 ` Thomas Huth
2025-10-02 5:25 ` Philippe Mathieu-Daudé
2025-10-01 17:09 ` [PATCH 7/7] scripts/ci: use recommended registration command Alex Bennée
2025-10-01 17:56 ` [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab) BALATON Zoltan
2025-10-01 18:37 ` Daniel P. Berrangé
2025-10-01 19:31 ` BALATON Zoltan
2025-10-01 21:51 ` Alex Bennée
2025-10-01 18:56 ` Alex Bennée
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=20251001170947.2769296-6-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=balaton@eik.bme.hu \
--cc=gustavo.romero@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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).