In anticipation of new runners lets move to a newer Ubuntu LTS.
Signed-off-by: Alex Bennée <[email protected]>
---
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
