* [PATCH 01/10] ci: remove centos-steam-8 customer runner
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` Alex Bennée
` (8 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
This broke since eef0bae3a7 (migration: Remove block migration) but
even after that was addressed it still fails to complete. As it will
shortly be EOL lets to remove the runner definition and the related
ansible setup bits.
We still have centos9 docker images build and test.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240521125314.1255403-2-alex.bennee@linaro.org>
---
docs/devel/ci-jobs.rst.inc | 7 -
.gitlab-ci.d/custom-runners.yml | 1 -
.../custom-runners/centos-stream-8-x86_64.yml | 24 ---
.../org.centos/stream/8/build-environment.yml | 82 --------
.../ci/org.centos/stream/8/x86_64/configure | 198 ------------------
.../org.centos/stream/8/x86_64/test-avocado | 65 ------
scripts/ci/org.centos/stream/README | 17 --
7 files changed, 394 deletions(-)
delete mode 100644 .gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
delete mode 100644 scripts/ci/org.centos/stream/8/build-environment.yml
delete mode 100755 scripts/ci/org.centos/stream/8/x86_64/configure
delete mode 100755 scripts/ci/org.centos/stream/8/x86_64/test-avocado
delete mode 100644 scripts/ci/org.centos/stream/README
diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc
index be06322279..3756bbe355 100644
--- a/docs/devel/ci-jobs.rst.inc
+++ b/docs/devel/ci-jobs.rst.inc
@@ -182,13 +182,6 @@ If you've got access to an IBM Z host that can be used as a gitlab-CI
runner, you can set this variable to enable the tests that require this
kind of host. The runner should be tagged with "s390x".
-CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you've got access to a CentOS Stream 8 x86_64 host that can be
-used as a gitlab-CI runner, you can set this variable to enable the
-tests that require this kind of host. The runner should be tagged with
-both "centos_stream_8" and "x86_64".
-
CCACHE_DISABLE
~~~~~~~~~~~~~~
The jobs are configured to use "ccache" by default since this typically
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 29e52df283..1aa3c60efe 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -32,4 +32,3 @@ 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/centos-stream-8-x86_64.yml'
diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
deleted file mode 100644
index 367424db78..0000000000
--- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# All centos-stream-8 jobs should run successfully in an environment
-# setup by the scripts/ci/setup/stream/8/build-environment.yml task
-# "Installation of extra packages to build QEMU"
-
-centos-stream-8-x86_64:
- extends: .custom_runner_template
- allow_failure: true
- needs: []
- stage: build
- tags:
- - centos_stream_8
- - x86_64
- rules:
- - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
- - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
- before_script:
- - JOBS=$(expr $(nproc) + 1)
- script:
- - mkdir build
- - cd build
- - ../scripts/ci/org.centos/stream/8/x86_64/configure
- || { cat config.log meson-logs/meson-log.txt; exit 1; }
- - make -j"$JOBS"
- - make NINJA=":" check check-avocado
diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml
deleted file mode 100644
index 1ead77e2cb..0000000000
--- a/scripts/ci/org.centos/stream/8/build-environment.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-- name: Installation of extra packages to build QEMU
- hosts: all
- tasks:
- - name: Extra check for CentOS Stream 8
- lineinfile:
- path: /etc/redhat-release
- line: CentOS Stream release 8
- state: present
- check_mode: yes
- register: centos_stream_8
-
- - name: Enable EPEL repo on CentOS Stream 8
- dnf:
- name:
- - epel-release
- state: present
- when:
- - centos_stream_8
-
- - name: Enable PowerTools repo on CentOS Stream 8
- ini_file:
- path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
- section: powertools
- option: enabled
- value: "1"
- when:
- - centos_stream_8
-
- - name: Install basic packages to build QEMU on CentOS Stream 8
- dnf:
- name:
- - bzip2
- - bzip2-devel
- - capstone-devel
- - dbus-daemon
- - device-mapper-multipath-devel
- - diffutils
- - gcc
- - gcc-c++
- - genisoimage
- - gettext
- - git
- - glib2-devel
- - glusterfs-api-devel
- - gnutls-devel
- - libaio-devel
- - libcap-ng-devel
- - libcurl-devel
- - libepoxy-devel
- - libfdt-devel
- - libgcrypt-devel
- - libiscsi-devel
- - libpmem-devel
- - librados-devel
- - librbd-devel
- - libseccomp-devel
- - libslirp-devel
- - libssh-devel
- - libxkbcommon-devel
- - lzo-devel
- - make
- - mesa-libEGL-devel
- - nettle-devel
- - ninja-build
- - nmap-ncat
- - numactl-devel
- - pixman-devel
- - python38
- - python3-sphinx
- - rdma-core-devel
- - redhat-rpm-config
- - snappy-devel
- - spice-glib-devel
- - spice-server-devel
- - systemd-devel
- - systemtap-sdt-devel
- - tar
- - zlib-devel
- state: present
- when:
- - centos_stream_8
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure
deleted file mode 100755
index 868db665f6..0000000000
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/sh -e
-#
-# Configuration for QEMU based on CentOS Stream 8 x86_64 builds
-#
-# The "configure" command line is based on:
-#
-# https://git.centos.org/rpms/qemu-kvm/blob/c8s-stream-rhel/f/SPECS/qemu-kvm.spec
-#
-# But, because the SPEC file contains a number of conditionals and
-# variable and expansions only available at RPM build time, this version
-# was initially generated from an actual RPM build on an x86_64 platform.
-#
-# From that initial version, options that are required or are a
-# consequence of non-upstream patches have been adapted. One example
-# is "--without-default-devices" which is *not* present here, given
-# that patches adding downstream specific devices are not available.
-#
-../configure \
---python=/usr/bin/python3.8 \
---prefix="/usr" \
---libdir="/usr/lib64" \
---datadir="/usr/share" \
---sysconfdir="/etc" \
---interp-prefix=/usr/qemu-%M \
---localstatedir="/var" \
---docdir="/usr/share/doc" \
---libexecdir="/usr/libexec" \
---extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
---extra-cflags="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \
---with-suffix="qemu-kvm" \
---firmwarepath=/usr/share/qemu-firmware \
---target-list="x86_64-softmmu" \
---block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \
---audio-drv-list="" \
---block-drv-ro-whitelist="vmdk,vhdx,vpc,https,ssh" \
---with-coroutine=ucontext \
---tls-priority=@QEMU,SYSTEM \
---disable-af-xdp \
---disable-attr \
---disable-auth-pam \
---disable-avx2 \
---disable-avx512f \
---disable-bochs \
---disable-bpf \
---disable-brlapi \
---disable-bsd-user \
---disable-bzip2 \
---disable-cap-ng \
---disable-capstone \
---disable-cfi \
---disable-cfi-debug \
---disable-cloop \
---disable-cocoa \
---disable-coroutine-pool \
---disable-crypto-afalg \
---disable-curl \
---disable-curses \
---disable-debug-info \
---disable-debug-mutex \
---disable-debug-tcg \
---disable-dmg \
---disable-docs \
---disable-fuse \
---disable-fuse-lseek \
---disable-gcrypt \
---disable-gio \
---disable-glusterfs \
---disable-gnutls \
---disable-gtk \
---disable-guest-agent \
---disable-guest-agent-msi \
---disable-hvf \
---disable-iconv \
---disable-kvm \
---disable-libdaxctl \
---disable-libiscsi \
---disable-libnfs \
---disable-libpmem \
---disable-libssh \
---disable-libudev \
---disable-libusb \
---disable-linux-aio \
---disable-linux-io-uring \
---disable-linux-user \
---disable-live-block-migration \
---disable-lto \
---disable-lzfse \
---disable-lzo \
---disable-malloc-trim \
---disable-membarrier \
---disable-modules \
---disable-module-upgrades \
---disable-mpath \
---disable-multiprocess \
---disable-netmap \
---disable-nettle \
---disable-numa \
---disable-nvmm \
---disable-opengl \
---disable-parallels \
---disable-pie \
---disable-qcow1 \
---disable-qed \
---disable-qom-cast-debug \
---disable-rbd \
---disable-rdma \
---disable-replication \
---disable-rng-none \
---disable-safe-stack \
---disable-sanitizers \
---disable-sdl \
---disable-sdl-image \
---disable-seccomp \
---disable-slirp-smbd \
---disable-smartcard \
---disable-snappy \
---disable-sparse \
---disable-spice \
---disable-strip \
---disable-system \
---disable-tcg \
---disable-tools \
---disable-tpm \
---disable-u2f \
---disable-usb-redir \
---disable-user \
---disable-vde \
---disable-vdi \
---disable-vhost-crypto \
---disable-vhost-kernel \
---disable-vhost-net \
---disable-vhost-user \
---disable-vhost-user-blk-server \
---disable-vhost-vdpa \
---disable-virglrenderer \
---disable-virtfs \
---disable-vnc \
---disable-vnc-jpeg \
---disable-png \
---disable-vnc-sasl \
---disable-vte \
---disable-vvfat \
---disable-werror \
---disable-whpx \
---disable-xen \
---disable-xen-pci-passthrough \
---disable-xkbcommon \
---disable-zstd \
---enable-attr \
---enable-avx2 \
---enable-cap-ng \
---enable-capstone \
---enable-coroutine-pool \
---enable-curl \
---enable-debug-info \
---enable-docs \
---enable-fdt \
---enable-gcrypt \
---enable-glusterfs \
---enable-gnutls \
---enable-guest-agent \
---enable-iconv \
---enable-kvm \
---enable-libiscsi \
---enable-libpmem \
---enable-libssh \
---enable-libusb \
---enable-libudev \
---enable-linux-aio \
---enable-lzo \
---enable-malloc-trim \
---enable-modules \
---enable-mpath \
---enable-numa \
---enable-opengl \
---enable-pie \
---enable-rbd \
---enable-rdma \
---enable-seccomp \
---enable-snappy \
---enable-smartcard \
---enable-spice \
---enable-system \
---enable-tcg \
---enable-tools \
---enable-tpm \
---enable-trace-backends=dtrace \
---enable-usb-redir \
---enable-vhost-kernel \
---enable-vhost-net \
---enable-vhost-user \
---enable-vhost-user-blk-server \
---enable-vhost-vdpa \
---enable-vnc \
---enable-png \
---enable-vnc-sasl \
---enable-werror \
---enable-xkbcommon
diff --git a/scripts/ci/org.centos/stream/8/x86_64/test-avocado b/scripts/ci/org.centos/stream/8/x86_64/test-avocado
deleted file mode 100755
index 73e7a1a312..0000000000
--- a/scripts/ci/org.centos/stream/8/x86_64/test-avocado
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh -e
-#
-# Runs a previously vetted list of tests, either marked explicitly for
-# KVM and x86_64, or tests that are generic enough to be valid for all
-# targets. Such a test list can be generated with:
-#
-# ./pyvenv/bin/avocado list --filter-by-tags-include-empty \
-# --filter-by-tags-include-empty-key -t accel:kvm,arch:x86_64 \
-# tests/avocado/
-#
-# This is almost the complete list of avocado based tests available at
-# the time this was compile, with the following exceptions:
-#
-# * Require machine type "x-remote":
-# - tests/avocado/multiprocess.py:Multiprocess.test_multiprocess_x86_64
-#
-# * Requires display type "egl-headless":
-# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_virtio_vga_virgl
-# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_vhost_user_vga_virgl
-#
-# * Test is marked (unconditionally) to be skipped:
-# - tests/avocado/virtio_check_params.py:VirtioMaxSegSettingsCheck.test_machine_types
-#
-make get-vm-images
-./pyvenv/bin/avocado run \
- --job-results-dir=tests/results/ \
- tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_i440fx_kvm \
- tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_q35_kvm \
- tests/avocado/boot_linux_console.py:BootLinuxConsole.test_x86_64_pc \
- tests/avocado/cpu_queries.py:QueryCPUModelExpansion.test \
- tests/avocado/empty_cpu_model.py:EmptyCPUModel.test \
- tests/avocado/hotplug_cpu.py:HotPlugCPU.test \
- tests/avocado/netdev-ethtool.py:NetDevEthtool.test_igb \
- tests/avocado/netdev-ethtool.py:NetDevEthtool.test_igb_nomsi \
- tests/avocado/info_usernet.py:InfoUsernet.test_hostfwd \
- tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu \
- tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_pt \
- tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict \
- tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict_cm \
- tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_exit_error_msg_with_linux_v3_6 \
- tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_work_with_linux_v4_16 \
- tests/avocado/migration.py:Migration.test_migration_with_exec \
- tests/avocado/migration.py:Migration.test_migration_with_tcp_localhost \
- tests/avocado/migration.py:Migration.test_migration_with_unix \
- tests/avocado/pc_cpu_hotplug_props.py:OmittedCPUProps.test_no_die_id \
- tests/avocado/replay_kernel.py:ReplayKernelNormal.test_x86_64_pc \
- tests/avocado/reverse_debugging.py:ReverseDebugging_X86_64.test_x86_64_pc \
- tests/avocado/version.py:Version.test_qmp_human_info_version \
- tests/avocado/virtio_version.py:VirtioVersionCheck.test_conventional_devs \
- tests/avocado/virtio_version.py:VirtioVersionCheck.test_modern_only_devs \
- tests/avocado/vnc.py:Vnc.test_change_password \
- tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password \
- tests/avocado/vnc.py:Vnc.test_no_vnc \
- tests/avocado/vnc.py:Vnc.test_no_vnc_change_password \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_0 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_1 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_set_4_0 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_unset_4_1 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_4_0 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_set_4_0 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_4_0 \
- tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_unset_4_1 \
- tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_0_alias_compatibility \
- tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias \
- tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_none_alias
diff --git a/scripts/ci/org.centos/stream/README b/scripts/ci/org.centos/stream/README
deleted file mode 100644
index e3eadfe3ea..0000000000
--- a/scripts/ci/org.centos/stream/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This directory contains scripts for generating a build of QEMU that
-closely matches the CentOS Stream[1] builds of the qemu-kvm package.
-
-To have the environment ready to configure, build QEMU and run tests,
-please start with a CentOS Stream machine and:
-
- * apply the generic "build-environment.yml" playbook located at
- scripts/ci/setup
-
- * apply the "build-environment.yml" in the directory following the
- CentOS Stream version (such as "8").
-
-This currently only covers CentOS Stream 8 environments and
-packages[2].
-
-[1] https://www.centos.org/centos-stream/
-[2] https://git.centos.org/rpms/qemu-kvm/commits/c8s-stream-rhel
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/10] docs/devel: update references to centos to non-versioned container
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` Alex Bennée
` (8 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
>>From the website:
"After May 31, 2024, CentOS Stream 8 will be archived and no further
updates will be provided."
We have updated a few bits but there are still references that need
fixing. Rather than bump I've replaced them with references to the
Debian image so we don't have to bump at the next update.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240521125314.1255403-3-alex.bennee@linaro.org>
---
v2
- replaced centos with debian, tweaked commit message
---
docs/devel/testing.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index fa28e3ecb2..23d3f44f52 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -387,9 +387,9 @@ make target):
.. code::
- make docker-test-build@centos8
+ make docker-test-build@debian
-This will create a container instance using the ``centos8`` image (the image
+This will create a container instance using the ``debian`` image (the image
is downloaded and initialized automatically), in which the ``test-build`` job
is executed.
@@ -410,8 +410,8 @@ locally by using the ``NOCACHE`` build option:
Images
~~~~~~
-Along with many other images, the ``centos8`` image is defined in a Dockerfile
-in ``tests/docker/dockerfiles/``, called ``centos8.docker``. ``make docker-help``
+Along with many other images, the ``debian`` image is defined in a Dockerfile
+in ``tests/docker/dockerfiles/``, called ``debian.docker``. ``make docker-help``
command will list all the available images.
A ``.pre`` script can be added beside the ``.docker`` file, which will be
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/10] docs/devel: update references to centos to non-versioned container
@ 2024-05-29 16:09 ` Alex Bennée
0 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
>From the website:
"After May 31, 2024, CentOS Stream 8 will be archived and no further
updates will be provided."
We have updated a few bits but there are still references that need
fixing. Rather than bump I've replaced them with references to the
Debian image so we don't have to bump at the next update.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240521125314.1255403-3-alex.bennee@linaro.org>
---
v2
- replaced centos with debian, tweaked commit message
---
docs/devel/testing.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index fa28e3ecb2..23d3f44f52 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -387,9 +387,9 @@ make target):
.. code::
- make docker-test-build@centos8
+ make docker-test-build@debian
-This will create a container instance using the ``centos8`` image (the image
+This will create a container instance using the ``debian`` image (the image
is downloaded and initialized automatically), in which the ``test-build`` job
is executed.
@@ -410,8 +410,8 @@ locally by using the ``NOCACHE`` build option:
Images
~~~~~~
-Along with many other images, the ``centos8`` image is defined in a Dockerfile
-in ``tests/docker/dockerfiles/``, called ``centos8.docker``. ``make docker-help``
+Along with many other images, the ``debian`` image is defined in a Dockerfile
+in ``tests/docker/dockerfiles/``, called ``debian.docker``. ``make docker-help``
command will list all the available images.
A ``.pre`` script can be added beside the ``.docker`` file, which will be
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 02/10] docs/devel: update references to centos to non-versioned container
2024-05-29 16:09 ` Alex Bennée
@ 2024-05-29 17:25 ` Thomas Huth
-1 siblings, 0 replies; 16+ messages in thread
From: Thomas Huth @ 2024-05-29 17:25 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Richard Henderson,
Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Paolo Bonzini, Jiaxun Yang, qemu-arm, Cleber Rosa, Joel Stanley,
Aurelien Jarno, Philippe Mathieu-Daudé, Marcin Juszkiewicz,
Peter Maydell, qemu-s390x, Radoslaw Biernacki
On 29/05/2024 18.09, Alex Bennée wrote:
>>>From the website:
>
> "After May 31, 2024, CentOS Stream 8 will be archived and no further
> updates will be provided."
>
> We have updated a few bits but there are still references that need
> fixing. Rather than bump I've replaced them with references to the
> Debian image so we don't have to bump at the next update.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 02/10] docs/devel: update references to centos to non-versioned container
@ 2024-05-29 17:25 ` Thomas Huth
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Huth @ 2024-05-29 17:25 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Richard Henderson,
Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Paolo Bonzini, Jiaxun Yang, qemu-arm, Cleber Rosa, Joel Stanley,
Aurelien Jarno, Philippe Mathieu-Daudé, Marcin Juszkiewicz,
Peter Maydell, qemu-s390x, Radoslaw Biernacki
On 29/05/2024 18.09, Alex Bennée wrote:
>>From the website:
>
> "After May 31, 2024, CentOS Stream 8 will be archived and no further
> updates will be provided."
>
> We have updated a few bits but there are still references that need
> fixing. Rather than bump I've replaced them with references to the
> Debian image so we don't have to bump at the next update.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 03/10] tests/vm: update centos.aarch64 image to 9
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
2024-05-29 16:09 ` [PATCH 01/10] ci: remove centos-steam-8 customer runner Alex Bennée
2024-05-29 16:09 ` Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 04/10] tests/vm: remove plain centos image Alex Bennée
` (6 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
As Centos Stream 8 goes out of support we need to update. To do this
powertools is replaced by crb and we don't over specify the python3 we
want.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240521125314.1255403-4-alex.bennee@linaro.org>
---
tests/vm/centos.aarch64 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64
index 3f58de1e64..fcf9e08c87 100755
--- a/tests/vm/centos.aarch64
+++ b/tests/vm/centos.aarch64
@@ -25,9 +25,9 @@ DEFAULT_CONFIG = {
'cpu' : "max",
'machine' : "virt,gic-version=max",
'install_cmds' : (
- "dnf config-manager --set-enabled powertools, "
+ "dnf config-manager --enable crb, "
"dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo, "
- "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bison "\
+ "dnf install -y make ninja-build git python3 gcc gcc-c++ flex bison "\
"glib2-devel pixman-devel zlib-devel docker-ce.aarch64, "
"systemctl enable docker, "
),
@@ -38,10 +38,10 @@ DEFAULT_CONFIG = {
class CentosAarch64VM(basevm.BaseVM):
- name = "centos8.aarch64"
+ name = "centos9.aarch64"
arch = "aarch64"
- image_name = "CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2"
- image_link = "https://cloud.centos.org/centos/8-stream/aarch64/images/"
+ image_name = "CentOS-Stream-GenericCloud-9-20230501.0.aarch64.qcow2"
+ image_link = "https://cloud.centos.org/centos/9-stream/aarch64/images/"
image_link += image_name
BUILD_SCRIPT = """
set -e;
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/10] tests/vm: remove plain centos image
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (2 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 03/10] tests/vm: update centos.aarch64 image to 9 Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 05/10] scripts/ci: remove CentOS bits from common build-environment Alex Bennée
` (5 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
This isn't really used and we have lighter weight docker containers
for testing this stuff directly.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240521125314.1255403-5-alex.bennee@linaro.org>
---
tests/vm/Makefile.include | 1 -
tests/vm/centos | 51 ---------------------------------------
2 files changed, 52 deletions(-)
delete mode 100755 tests/vm/centos
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index ac56824a87..13ed80f72d 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -45,7 +45,6 @@ vm-help vm-test:
@echo " vm-build-netbsd - Build QEMU in NetBSD VM"
@echo " vm-build-openbsd - Build QEMU in OpenBSD VM"
ifneq ($(GENISOIMAGE),)
- @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker"
ifneq ($(EFI_AARCH64),)
@echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 VM"
@echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 VM"
diff --git a/tests/vm/centos b/tests/vm/centos
deleted file mode 100755
index d25c8f8b5b..0000000000
--- a/tests/vm/centos
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-#
-# CentOS 8 Stream image
-#
-# Copyright 2018, 2022 Red Hat Inc.
-#
-# Authors:
-# Fam Zheng <famz@redhat.com>
-#
-# This code is licensed under the GPL version 2 or later. See
-# the COPYING file in the top-level directory.
-#
-
-import os
-import sys
-import subprocess
-import basevm
-import time
-
-class CentosVM(basevm.BaseVM):
- name = "centos"
- arch = "x86_64"
- BUILD_SCRIPT = """
- set -e;
- cd $(mktemp -d);
- export SRC_ARCHIVE=/dev/vdb;
- sudo chmod a+r $SRC_ARCHIVE;
- tar -xf $SRC_ARCHIVE;
- make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1;
- make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1;
- """
-
- def build_image(self, img):
- cimg = self._download_with_cache("https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2")
- img_tmp = img + ".tmp"
- subprocess.check_call(['cp', '-f', cimg, img_tmp])
- self.exec_qemu_img("resize", img_tmp, "50G")
- self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()])
- self.wait_ssh()
- self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
- self.ssh_root_check("dnf update -y")
- self.ssh_root_check("dnf install -y dnf-plugins-core")
- self.ssh_root_check("dnf config-manager --set-enabled powertools")
- self.ssh_root_check("dnf install -y podman make ninja-build git python3")
- self.ssh_root("poweroff")
- self.wait()
- os.rename(img_tmp, img)
- return 0
-
-if __name__ == "__main__":
- sys.exit(basevm.main(CentosVM))
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/10] scripts/ci: remove CentOS bits from common build-environment
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (3 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 04/10] tests/vm: remove plain centos image Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 06/10] docs/ci: clean-up references for consistency Alex Bennée
` (4 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
Although I've just removed the CentOS specific build-environment its
probably a bit too confusing to have multiple distros mixed up in one
place. Prior to moving clean-up what will be just for ubuntu.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
scripts/ci/setup/build-environment.yml | 98 --------------------------
1 file changed, 98 deletions(-)
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index de0d866a1e..e82097b465 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -184,101 +184,3 @@
- ansible_facts['distribution_version'] == '22.04'
- ansible_facts['architecture'] == 'aarch64'
- - name: Enable EPEL repo on EL8
- dnf:
- name:
- - epel-release
- state: present
- when:
- - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_major_version'] == '8'
-
- - name: Enable PowerTools repo on CentOS 8
- ini_file:
- path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
- section: powertools
- option: enabled
- value: "1"
- when:
- - ansible_facts['distribution_file_variety'] == 'CentOS'
- - ansible_facts['distribution_major_version'] == '8'
-
- - name: Install basic packages to build QEMU on EL8
- dnf:
- # This list of packages start with tests/docker/dockerfiles/centos8.docker
- # but only include files that are common to all distro variants and present
- # in the standard repos (no add-ons)
- name:
- - bzip2
- - bzip2-devel
- - capstone-devel
- - dbus-daemon
- - device-mapper-multipath-devel
- - diffutils
- - gcc
- - gcc-c++
- - genisoimage
- - gettext
- - git
- - glib2-devel
- - glusterfs-api-devel
- - gnutls-devel
- - libaio-devel
- - libcap-ng-devel
- - libcurl-devel
- - libepoxy-devel
- - libfdt-devel
- - libgcrypt-devel
- - libiscsi-devel
- - libpmem-devel
- - librados-devel
- - librbd-devel
- - libseccomp-devel
- - libssh-devel
- - libxkbcommon-devel
- - lzo-devel
- - make
- - mesa-libEGL-devel
- - nettle-devel
- - ninja-build
- - nmap-ncat
- - numactl-devel
- - pixman-devel
- - python38
- - python3-sphinx
- - rdma-core-devel
- - redhat-rpm-config
- - snappy-devel
- - spice-glib-devel
- - systemd-devel
- - systemtap-sdt-devel
- - tar
- - zlib-devel
- state: present
- when:
- - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
-
- - name: Install packages only available on x86 and aarch64
- dnf:
- # Spice server not available in ppc64le
- name:
- - spice-server
- - spice-server-devel
- state: present
- when:
- - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
- - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
-
- - name: Check whether the Python runtime version is managed by alternatives
- stat:
- path: /etc/alternatives/python3
- register: python3
-
- - name: Set default Python runtime to 3.8 on EL8
- command: alternatives --set python3 /usr/bin/python3.8
- when:
- - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
- - python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.8'
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/10] docs/ci: clean-up references for consistency
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (4 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 05/10] scripts/ci: remove CentOS bits from common build-environment Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 07/10] tests/lcitool: bump to latest version Alex Bennée
` (3 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
Document we have split up build-environment by distro and update the
references that exist in the code base to be correct.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/devel/ci-runners.rst.inc | 13 ++++++-------
.../custom-runners/ubuntu-22.04-aarch32.yml | 2 +-
.../custom-runners/ubuntu-22.04-aarch64.yml | 2 +-
.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 2 +-
scripts/ci/setup/{ => ubuntu}/build-environment.yml | 0
5 files changed, 9 insertions(+), 10 deletions(-)
rename scripts/ci/setup/{ => ubuntu}/build-environment.yml (100%)
diff --git a/docs/devel/ci-runners.rst.inc b/docs/devel/ci-runners.rst.inc
index 7817001fb2..67b23d3719 100644
--- a/docs/devel/ci-runners.rst.inc
+++ b/docs/devel/ci-runners.rst.inc
@@ -41,19 +41,18 @@ those hosts. This would look like::
Build environment
~~~~~~~~~~~~~~~~~
-The ``scripts/ci/setup/build-environment.yml`` Ansible playbook will
-set up machines with the environment needed to perform builds and run
-QEMU tests. This playbook consists on the installation of various
-required packages (and a general package update while at it). It
-currently covers a number of different Linux distributions, but it can
-be expanded to cover other systems.
+The ``scripts/ci/setup/$DISTRO/build-environment.yml`` Ansible
+playbook will set up machines with the environment needed to perform
+builds and run QEMU tests. This playbook consists on the installation
+of various required packages (and a general package update while at
+it).
The minimum required version of Ansible successfully tested in this
playbook is 2.8.0 (a version check is embedded within the playbook
itself). To run the playbook, execute::
cd scripts/ci/setup
- ansible-playbook -i inventory build-environment.yml
+ ansible-playbook -i inventory $DISTRO/build-environment.yml
Please note that most of the tasks in the playbook require superuser
privileges, such as those from the ``root`` account or those obtained
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
index b8a0d75162..8727687e2b 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
@@ -1,5 +1,5 @@
# All ubuntu-22.04 jobs should run successfully in an environment
-# setup by the scripts/ci/setup/qemu/build-environment.yml task
+# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04"
ubuntu-22.04-aarch32-all:
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
index 374b0956c3..263a3c2140 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
@@ -1,5 +1,5 @@
# All ubuntu-22.04 jobs should run successfully in an environment
-# setup by the scripts/ci/setup/qemu/build-environment.yml task
+# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04"
ubuntu-22.04-aarch64-all-linux-static:
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
index 25935048e2..69ddd3e7d5 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
@@ -1,5 +1,5 @@
# All ubuntu-22.04 jobs should run successfully in an environment
-# setup by the scripts/ci/setup/build-environment.yml task
+# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04"
ubuntu-22.04-s390x-all-linux:
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
similarity index 100%
rename from scripts/ci/setup/build-environment.yml
rename to scripts/ci/setup/ubuntu/build-environment.yml
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/10] tests/lcitool: bump to latest version
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (5 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 06/10] docs/ci: clean-up references for consistency Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 17:23 ` Thomas Huth
2024-05-29 16:09 ` [PATCH 08/10] tests/lcitool: generate package lists for ansible Alex Bennée
` (2 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
We have to simultaneously update a few bits on our side as lcitool has
already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
there is no change to the package list yet.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v2
- fix typo s/lci-tool/lcitool/
---
tests/docker/dockerfiles/alpine.docker | 4 ++--
tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++--
tests/docker/dockerfiles/fedora.docker | 4 ++--
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 6 +++---
tests/lcitool/targets/centos-stream-8.yml | 3 ---
6 files changed, 10 insertions(+), 13 deletions(-)
delete mode 100644 tests/lcitool/targets/centos-stream-8.yml
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 554464f31e..b76cc2a35e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all alpine-318 qemu
+# $ lcitool dockerfile --layers all alpine-320 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.20
RUN apk update && \
apk upgrade && \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 0f78711876..cce6739613 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer
+# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 098c894d10..bd51e1e149 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all fedora-38 qemu
+# $ lcitool dockerfile --layers all fedora-40 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index cec6703971..a300a26c0d 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit cec67039719becbfbab866f9c23574f389cf9559
+Subproject commit a300a26c0d7f48544c40af268b3245ebd63c7351
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 789acefb75..ace4d08364 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -124,11 +124,11 @@ try:
#
# Standard native builds
#
- generate_dockerfile("alpine", "alpine-318")
+ generate_dockerfile("alpine", "alpine-320")
generate_dockerfile("centos9", "centos-stream-9")
generate_dockerfile("debian", "debian-12",
trailer="".join(debian12_extras))
- generate_dockerfile("fedora", "fedora-38")
+ generate_dockerfile("fedora", "fedora-40")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2204", "ubuntu-2204")
@@ -191,7 +191,7 @@ try:
trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user"))
- generate_dockerfile("fedora-win64-cross", "fedora-38",
+ generate_dockerfile("fedora-win64-cross", "fedora-40",
project='qemu,qemu-win-installer',
cross="mingw64",
trailer=cross_build("x86_64-w64-mingw32-",
diff --git a/tests/lcitool/targets/centos-stream-8.yml b/tests/lcitool/targets/centos-stream-8.yml
deleted file mode 100644
index 6b11160fd1..0000000000
--- a/tests/lcitool/targets/centos-stream-8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-paths:
- pip3: /usr/bin/pip3.8
- python: /usr/bin/python3.8
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 07/10] tests/lcitool: bump to latest version
2024-05-29 16:09 ` [PATCH 07/10] tests/lcitool: bump to latest version Alex Bennée
@ 2024-05-29 17:23 ` Thomas Huth
2024-05-29 18:12 ` Alex Bennée
0 siblings, 1 reply; 16+ messages in thread
From: Thomas Huth @ 2024-05-29 17:23 UTC (permalink / raw)
To: Alex Bennée, qemu-devel, Daniel P. Berrangé,
Cleber Rosa
Cc: Laurent Vivier, Wainer dos Santos Moschetta, Beraldo Leal,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Paolo Bonzini, Jiaxun Yang, qemu-arm, Joel Stanley,
Aurelien Jarno, Philippe Mathieu-Daudé, Marcin Juszkiewicz,
Peter Maydell, qemu-s390x, Radoslaw Biernacki
On 29/05/2024 18.09, Alex Bennée wrote:
> We have to simultaneously update a few bits on our side as lcitool has
> already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
> there is no change to the package list yet.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Have you tried a CI run with these changes? I don't think this will work
yet. There are various issues with Fedora 40 that we need to solve first.
Some of them are addressed with patches in my pull request from today, but
others need more work first:
- Avocado v88 is broken on Fedora 40 due to the missing "imp" package.
I've got a pull request for lci-tool pending, but it is not merged yet:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/489
- The "clang-system" jobs are failing due to the new -fsanitize=undefined
errors that it discovers. Question is whether we want to fix all of them,
or whether we disable the error detection instead.
- build-oss-fuzz job was failing, but that should get fixed with the
patches from my PR from today (thanks to Alexander Bulekov for the
patches)
So unless I missed something, you've got to postpone this patch a little bit.
Thomas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] tests/lcitool: bump to latest version
2024-05-29 17:23 ` Thomas Huth
@ 2024-05-29 18:12 ` Alex Bennée
0 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 18:12 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Daniel P. Berrangé, Cleber Rosa, Laurent Vivier,
Wainer dos Santos Moschetta, Beraldo Leal, Richard Henderson,
Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Paolo Bonzini, Jiaxun Yang, qemu-arm, Joel Stanley,
Aurelien Jarno, Philippe Mathieu-Daudé, Marcin Juszkiewicz,
Peter Maydell, qemu-s390x, Radoslaw Biernacki
Thomas Huth <thuth@redhat.com> writes:
> On 29/05/2024 18.09, Alex Bennée wrote:
>> We have to simultaneously update a few bits on our side as lcitool has
>> already deprecated fedora-38, alpine-3.18 and centos-8-stream. However
>> there is no change to the package list yet.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> Have you tried a CI run with these changes? I don't think this will
> work yet. There are various issues with Fedora 40 that we need to
> solve first. Some of them are addressed with patches in my pull
> request from today, but others need more work first:
>
> - Avocado v88 is broken on Fedora 40 due to the missing "imp" package.
> I've got a pull request for lci-tool pending, but it is not merged yet:
> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/489
>
> - The "clang-system" jobs are failing due to the new -fsanitize=undefined
> errors that it discovers. Question is whether we want to fix all of them,
> or whether we disable the error detection instead.
>
> - build-oss-fuzz job was failing, but that should get fixed with the
> patches from my PR from today (thanks to Alexander Bulekov for the
> patches)
>
> So unless I missed something, you've got to postpone this patch a
> little bit.
Ahh yes I see failures for:
build-oss-fuzz
clang-system
https://gitlab.com/stsquad/qemu/-/pipelines/1310569965/failures
>
> Thomas
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 08/10] tests/lcitool: generate package lists for ansible
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (6 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 07/10] tests/lcitool: bump to latest version Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 09/10] scripts/ci: drive ubuntu/build-environment.yml from lcitool Alex Bennée
2024-05-29 16:09 ` [PATCH 10/10] tests/avocado: update sbsa-ref firmware Alex Bennée
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
This includes updating libvirt-ci to the currently in-flight MR:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/488
With the new ability to output YAML we can build the package list for
our ansible setup scripts. We will integrate them in the next commit.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v2
- updated to latest revision of MR
---
.../ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 127 ++++++++++++++++++
.../ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 125 +++++++++++++++++
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 16 ++-
4 files changed, 268 insertions(+), 2 deletions(-)
create mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
create mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
new file mode 100644
index 0000000000..8d7d8725fb
--- /dev/null
+++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
@@ -0,0 +1,127 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+packages:
+ - bash
+ - bc
+ - bison
+ - bsdextrautils
+ - bzip2
+ - ca-certificates
+ - ccache
+ - clang
+ - dbus
+ - debianutils
+ - diffutils
+ - exuberant-ctags
+ - findutils
+ - flex
+ - gcc
+ - gcovr
+ - gettext
+ - git
+ - hostname
+ - libaio-dev
+ - libasan6
+ - libasound2-dev
+ - libattr1-dev
+ - libbpf-dev
+ - libbrlapi-dev
+ - libbz2-dev
+ - libc6-dev
+ - libcacard-dev
+ - libcap-ng-dev
+ - libcapstone-dev
+ - libcmocka-dev
+ - libcurl4-gnutls-dev
+ - libdaxctl-dev
+ - libdrm-dev
+ - libepoxy-dev
+ - libfdt-dev
+ - libffi-dev
+ - libfuse3-dev
+ - libgbm-dev
+ - libgcrypt20-dev
+ - libglib2.0-dev
+ - libglusterfs-dev
+ - libgnutls28-dev
+ - libgtk-3-dev
+ - libibumad-dev
+ - libibverbs-dev
+ - libiscsi-dev
+ - libjemalloc-dev
+ - libjpeg-turbo8-dev
+ - libjson-c-dev
+ - liblttng-ust-dev
+ - liblzo2-dev
+ - libncursesw5-dev
+ - libnfs-dev
+ - libnuma-dev
+ - libpam0g-dev
+ - libpcre2-dev
+ - libpipewire-0.3-dev
+ - libpixman-1-dev
+ - libpng-dev
+ - libpulse-dev
+ - librbd-dev
+ - librdmacm-dev
+ - libsasl2-dev
+ - libsdl2-dev
+ - libsdl2-image-dev
+ - libseccomp-dev
+ - libselinux1-dev
+ - libslirp-dev
+ - libsnappy-dev
+ - libsndio-dev
+ - libspice-protocol-dev
+ - libspice-server-dev
+ - libssh-dev
+ - libsystemd-dev
+ - libtasn1-6-dev
+ - libubsan1
+ - libudev-dev
+ - liburing-dev
+ - libusb-1.0-0-dev
+ - libusbredirhost-dev
+ - libvdeplug-dev
+ - libvirglrenderer-dev
+ - libvte-2.91-dev
+ - libxen-dev
+ - libzstd-dev
+ - llvm
+ - locales
+ - make
+ - meson
+ - mtools
+ - multipath-tools
+ - ncat
+ - nettle-dev
+ - ninja-build
+ - openssh-client
+ - pkgconf
+ - python3
+ - python3-numpy
+ - python3-opencv
+ - python3-pillow
+ - python3-pip
+ - python3-sphinx
+ - python3-sphinx-rtd-theme
+ - python3-tomli
+ - python3-venv
+ - python3-yaml
+ - rpm2cpio
+ - sed
+ - socat
+ - sparse
+ - swtpm
+ - systemtap-sdt-dev
+ - tar
+ - tesseract-ocr
+ - tesseract-ocr-eng
+ - xorriso
+ - zlib1g-dev
+ - zstd
+
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
new file mode 100644
index 0000000000..16050a5058
--- /dev/null
+++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
@@ -0,0 +1,125 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool variables --host-arch s390x ubuntu-2204 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+packages:
+ - bash
+ - bc
+ - bison
+ - bsdextrautils
+ - bzip2
+ - ca-certificates
+ - ccache
+ - clang
+ - dbus
+ - debianutils
+ - diffutils
+ - exuberant-ctags
+ - findutils
+ - flex
+ - gcc
+ - gcovr
+ - gettext
+ - git
+ - hostname
+ - libaio-dev
+ - libasan6
+ - libasound2-dev
+ - libattr1-dev
+ - libbpf-dev
+ - libbrlapi-dev
+ - libbz2-dev
+ - libc6-dev
+ - libcacard-dev
+ - libcap-ng-dev
+ - libcapstone-dev
+ - libcmocka-dev
+ - libcurl4-gnutls-dev
+ - libdaxctl-dev
+ - libdrm-dev
+ - libepoxy-dev
+ - libfdt-dev
+ - libffi-dev
+ - libfuse3-dev
+ - libgbm-dev
+ - libgcrypt20-dev
+ - libglib2.0-dev
+ - libglusterfs-dev
+ - libgnutls28-dev
+ - libgtk-3-dev
+ - libibumad-dev
+ - libibverbs-dev
+ - libiscsi-dev
+ - libjemalloc-dev
+ - libjpeg-turbo8-dev
+ - libjson-c-dev
+ - liblttng-ust-dev
+ - liblzo2-dev
+ - libncursesw5-dev
+ - libnfs-dev
+ - libnuma-dev
+ - libpam0g-dev
+ - libpcre2-dev
+ - libpipewire-0.3-dev
+ - libpixman-1-dev
+ - libpng-dev
+ - libpulse-dev
+ - librbd-dev
+ - librdmacm-dev
+ - libsasl2-dev
+ - libsdl2-dev
+ - libsdl2-image-dev
+ - libseccomp-dev
+ - libselinux1-dev
+ - libslirp-dev
+ - libsnappy-dev
+ - libsndio-dev
+ - libspice-protocol-dev
+ - libssh-dev
+ - libsystemd-dev
+ - libtasn1-6-dev
+ - libubsan1
+ - libudev-dev
+ - liburing-dev
+ - libusb-1.0-0-dev
+ - libusbredirhost-dev
+ - libvdeplug-dev
+ - libvirglrenderer-dev
+ - libvte-2.91-dev
+ - libzstd-dev
+ - llvm
+ - locales
+ - make
+ - meson
+ - mtools
+ - multipath-tools
+ - ncat
+ - nettle-dev
+ - ninja-build
+ - openssh-client
+ - pkgconf
+ - python3
+ - python3-numpy
+ - python3-opencv
+ - python3-pillow
+ - python3-pip
+ - python3-sphinx
+ - python3-sphinx-rtd-theme
+ - python3-tomli
+ - python3-venv
+ - python3-yaml
+ - rpm2cpio
+ - sed
+ - socat
+ - sparse
+ - swtpm
+ - systemtap-sdt-dev
+ - tar
+ - tesseract-ocr
+ - tesseract-ocr-eng
+ - xorriso
+ - zlib1g-dev
+ - zstd
+
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index a300a26c0d..6e8fa79119 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit a300a26c0d7f48544c40af268b3245ebd63c7351
+Subproject commit 6e8fa79119d131d95502b20051dd84353be57816
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index ace4d08364..3577a411a6 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -80,7 +80,7 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None):
def generate_cirrus(target, trailer=None):
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
- cmd = lcitool_cmd + ["variables", target, "qemu"]
+ cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
generate(filename, cmd, trailer)
@@ -90,6 +90,13 @@ def generate_pkglist(vm, target):
generate(filename, cmd, None)
+def generate_yaml(os, target, arch, trailer=None):
+ filename = Path(src_dir, "scripts", "ci", "setup", os, f"{target}-{arch}.yaml")
+ cmd = lcitool_cmd + ["variables", "--format", "yaml", "-a",
+ arch, target, "qemu"]
+ generate(filename, cmd, trailer)
+
+
# Netmap still needs to be manually built as it is yet to be packaged
# into a distro. We also add cscope and gtags which are used in the CI
# test
@@ -209,6 +216,13 @@ try:
#
generate_pkglist("freebsd", "freebsd-13")
+ #
+ # Ansible package lists
+ #
+ generate_yaml("ubuntu", "ubuntu-2204", "aarch64")
+ generate_yaml("ubuntu", "ubuntu-2204", "s390x")
+
+
sys.exit(0)
except Exception as ex:
print(str(ex), file=sys.stderr)
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/10] scripts/ci: drive ubuntu/build-environment.yml from lcitool
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (7 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 08/10] tests/lcitool: generate package lists for ansible Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
2024-05-29 16:09 ` [PATCH 10/10] tests/avocado: update sbsa-ref firmware Alex Bennée
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
Now lcitool can write the package list for us we no longer need to
duplicate the information directly in build-environment.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
scripts/ci/setup/ubuntu/build-environment.yml | 131 +-----------------
1 file changed, 7 insertions(+), 124 deletions(-)
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index e82097b465..edf1900b3e 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -32,135 +32,18 @@
when:
- ansible_facts['distribution'] == 'Ubuntu'
- # lcitool variables -f json ubuntu-2204 qemu | jq -r '.pkgs[]' | xargs -n 1 echo "-"
- - name: Install basic packages to build QEMU on Ubuntu 22.04
- package:
- name:
- - bash
- - bc
- - bison
- - bsdextrautils
- - bzip2
- - ca-certificates
- - ccache
- - clang
- - dbus
- - debianutils
- - diffutils
- - exuberant-ctags
- - findutils
- - flex
- - g++
- - gcc
- - gcovr
- - genisoimage
- - gettext
- - git
- - hostname
- - libaio-dev
- - libasan5
- - libasound2-dev
- - libattr1-dev
- - libbpf-dev
- - libbrlapi-dev
- - libbz2-dev
- - libc6-dev
- - libcacard-dev
- - libcap-ng-dev
- - libcapstone-dev
- - libcmocka-dev
- - libcurl4-gnutls-dev
- - libdaxctl-dev
- - libdrm-dev
- - libepoxy-dev
- - libfdt-dev
- - libffi-dev
- - libgbm-dev
- - libgcrypt20-dev
- - libglib2.0-dev
- - libglusterfs-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libibumad-dev
- - libibverbs-dev
- - libiscsi-dev
- - libjemalloc-dev
- - libjpeg-turbo8-dev
- - libjson-c-dev
- - liblttng-ust-dev
- - liblzo2-dev
- - libncursesw5-dev
- - libnfs-dev
- - libnuma-dev
- - libpam0g-dev
- - libpcre2-dev
- - libpixman-1-dev
- - libpng-dev
- - libpulse-dev
- - librbd-dev
- - librdmacm-dev
- - libsasl2-dev
- - libsdl2-dev
- - libsdl2-image-dev
- - libseccomp-dev
- - libslirp-dev
- - libsnappy-dev
- - libspice-protocol-dev
- - libssh-dev
- - libsystemd-dev
- - libtasn1-6-dev
- - libubsan1
- - libudev-dev
- - liburing-dev
- - libusb-1.0-0-dev
- - libusbredirhost-dev
- - libvdeplug-dev
- - libvirglrenderer-dev
- - libvte-2.91-dev
- - libxml2-dev
- - libzstd-dev
- - llvm
- - locales
- - make
- - meson
- - multipath-tools
- - ncat
- - nettle-dev
- - ninja-build
- - openssh-client
- - pkgconf
- - python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- - python3-pip
- - python3-sphinx
- - python3-sphinx-rtd-theme
- - python3-venv
- - python3-yaml
- - rpm2cpio
- - sed
- - sparse
- - systemtap-sdt-dev
- - tar
- - tesseract-ocr
- - tesseract-ocr-eng
- - texinfo
- - xfslibs-dev
- - zlib1g-dev
- state: present
+ # 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"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
- # not all packages are available for all architectures
- - name: Install additional packages to build QEMU on Ubuntu 22.04
+ - name: Install packages for QEMU on Ubuntu 22.04
package:
- name:
- - libpmem-dev
- - libspice-server-dev
- - libxen-dev
- state: present
+ name: "{{ packages }}"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04'
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/10] tests/avocado: update sbsa-ref firmware
2024-05-29 16:09 [PATCH 00/10] testing/next: purging centos and more lcitool Alex Bennée
` (8 preceding siblings ...)
2024-05-29 16:09 ` [PATCH 09/10] scripts/ci: drive ubuntu/build-environment.yml from lcitool Alex Bennée
@ 2024-05-29 16:09 ` Alex Bennée
9 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2024-05-29 16:09 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta,
Daniel P. Berrangé, Beraldo Leal, Thomas Huth,
Richard Henderson, Leif Lindholm, John Snow, Markus Armbruster,
Marc-André Lureau, Pavel Dovgalyuk, Mark Cave-Ayland,
Alex Bennée, Paolo Bonzini, Jiaxun Yang, qemu-arm,
Cleber Rosa, Joel Stanley, Aurelien Jarno,
Philippe Mathieu-Daudé, Marcin Juszkiewicz, Peter Maydell,
qemu-s390x, Radoslaw Biernacki
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Partial support for NUMA setup:
- cpu nodes
- memory nodes
Used versions:
- Trusted Firmware v2.11.0
- Tianocore EDK2 stable202405
- Tianocore EDK2 Platforms code commit 4bbd0ed
Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Message-Id: <20240528182917.91027-1-marcin.juszkiewicz@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/avocado/machine_aarch64_sbsaref.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 98c76c1ff7..6bb82f2a03 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -37,18 +37,18 @@ def fetch_firmware(self):
Used components:
- - Trusted Firmware 2.10.2
- - Tianocore EDK2 stable202402
- - Tianocore EDK2-platforms commit 085c2fb
+ - Trusted Firmware 2.11.0
+ - Tianocore EDK2 stable202405
+ - Tianocore EDK2-platforms commit 4bbd0ed
"""
# Secure BootRom (TF-A code)
fs0_xz_url = (
"https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
- "20240313-116475/edk2/SBSA_FLASH0.fd.xz"
+ "20240528-140808/edk2/SBSA_FLASH0.fd.xz"
)
- fs0_xz_hash = "637593749cc307dea7dc13265c32e5d020267552f22b18a31850b8429fc5e159"
+ fs0_xz_hash = "fa6004900b67172914c908b78557fec4d36a5f784f4c3dd08f49adb75e1892a9"
tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash,
algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
@@ -57,9 +57,9 @@ def fetch_firmware(self):
# Non-secure rom (UEFI and EFI variables)
fs1_xz_url = (
"https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
- "20240313-116475/edk2/SBSA_FLASH1.fd.xz"
+ "20240528-140808/edk2/SBSA_FLASH1.fd.xz"
)
- fs1_xz_hash = "cb0a5e8cf5e303c5d3dc106cfd5943ffe9714b86afddee7164c69ee1dd41991c"
+ fs1_xz_hash = "5f3747d4000bc416d9641e33ff4ac60c3cc8cb74ca51b6e932e58531c62eb6f7"
tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash,
algorithm='sha256')
archive.extract(tar_xz_path, self.workdir)
@@ -98,15 +98,15 @@ def test_sbsaref_edk2_firmware(self):
# AP Trusted ROM
wait_for_console_pattern(self, "Booting Trusted Firmware")
- wait_for_console_pattern(self, "BL1: v2.10.2(release):")
+ wait_for_console_pattern(self, "BL1: v2.11.0(release):")
wait_for_console_pattern(self, "BL1: Booting BL2")
# Trusted Boot Firmware
- wait_for_console_pattern(self, "BL2: v2.10.2(release)")
+ wait_for_console_pattern(self, "BL2: v2.11.0(release)")
wait_for_console_pattern(self, "Booting BL31")
# EL3 Runtime Software
- wait_for_console_pattern(self, "BL31: v2.10.2(release)")
+ wait_for_console_pattern(self, "BL31: v2.11.0(release)")
# Non-trusted Firmware
wait_for_console_pattern(self, "UEFI firmware (version 1.0")
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread