Commit 2a428c8541 for qemu.org
commit 2a428c8541ec5e9be54aad5f0a446ec8172226c9
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Aug 13 15:12:55 2026 +0200
dockerfiles: remove packages required by Avocado
Make our CI containers smaller, by removing a handful of packages that
were only included as dependencies of Avocado.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/.gitlab-ci.d/macos-14.vars b/.gitlab-ci.d/macos-14.vars
index def77cfdea..0c187624dd 100644
--- a/.gitlab-ci.d/macos-14.vars
+++ b/.gitlab-ci.d/macos-14.vars
@@ -12,5 +12,5 @@ NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka coreutils ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python-setuptools python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd'
-PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
+PYPI_PKGS='sphinx sphinx-rtd-theme tomli'
PYTHON='/opt/homebrew/bin/python3'
diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/setup/debian/debian-13-ppc64le.yaml
index e64321357d..9acd99a743 100644
--- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml
+++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml
@@ -105,9 +105,6 @@ packages:
- openssh-client
- pkgconf
- python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- python3-pip
- python3-setuptools
- python3-sphinx
@@ -115,7 +112,6 @@ packages:
- python3-tomli
- python3-venv
- python3-wheel
- - python3-yaml
- rpm2cpio
- rustc
- sed
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
index 12b0e38a22..5c948109df 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
@@ -106,9 +106,6 @@ packages:
- openssh-client
- pkgconf
- python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- python3-pip
- python3-setuptools
- python3-sphinx
@@ -116,7 +113,6 @@ packages:
- python3-tomli
- python3-venv
- python3-wheel
- - python3-yaml
- rpm2cpio
- rustc-1.83
- sed
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
index 56299f4cc2..010b7f86aa 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
@@ -104,9 +104,6 @@ packages:
- openssh-client
- pkgconf
- python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- python3-pip
- python3-setuptools
- python3-sphinx
@@ -114,7 +111,6 @@ packages:
- python3-tomli
- python3-venv
- python3-wheel
- - python3-yaml
- rpm2cpio
- rustc-1.83
- sed
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 118c6e8eea..8a5a355e89 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -83,14 +83,11 @@ RUN apk update && \
pixman-dev \
pkgconf \
pulseaudio-dev \
- py3-numpy \
- py3-pillow \
py3-pip \
py3-setuptools \
py3-sphinx \
py3-sphinx_rtd_theme \
py3-wheel \
- py3-yaml \
python3 \
rpm2cpio \
rust \
diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker
index 0d5b5fa7f5..e38cd692db 100644
--- a/tests/docker/dockerfiles/centos9.docker
+++ b/tests/docker/dockerfiles/centos9.docker
@@ -96,9 +96,6 @@ RUN dnf --quiet distro-sync -y && \
pkgconfig \
pulseaudio-libs-devel \
python3 \
- python3-PyYAML \
- python3-numpy \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 061cd8e9b8..823606dc52 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 3dfa60fdfd..ed58e089ec 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 401c64269c..0843f7428a 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index 8b60c7b085..caba08f842 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 2a7e8cba05..17018c0dab 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 349de3a0bb..2408d453c2 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 8bc42b1e00..2b0a344c2c 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -41,9 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -51,7 +48,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index 413986d3f0..064b2ad1f1 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -113,9 +113,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -123,7 +120,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc \
sed \
diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker
index 4f84b80379..dcad3af2a7 100644
--- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
+++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@@ -104,10 +104,6 @@ exec "$@"\n' > /usr/bin/nosync && \
pkgconfig \
pulseaudio-libs-devel \
python3 \
- python3-PyYAML \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index c1e63feb46..bce350dfd8 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -44,10 +44,6 @@ exec "$@"\n' > /usr/bin/nosync && \
ninja-build \
openssh-clients \
python3 \
- python3-PyYAML \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index a6996917c4..c541f5d5b1 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -104,10 +104,6 @@ exec "$@"\n' > /usr/bin/nosync && \
pkgconfig \
pulseaudio-libs-devel \
python3 \
- python3-PyYAML \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index fc363c647c..8d8631bbcf 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -93,12 +93,8 @@ RUN zypper update -y && \
pcre2-devel-static \
pipewire-devel \
pkgconfig \
- python3-Pillow \
- python3-PyYAML \
python3-Sphinx \
python3-base \
- python3-numpy \
- python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx_rtd_theme \
diff --git a/tests/docker/dockerfiles/ubuntu2404.docker b/tests/docker/dockerfiles/ubuntu2404.docker
index 27992e34fd..f027eef022 100644
--- a/tests/docker/dockerfiles/ubuntu2404.docker
+++ b/tests/docker/dockerfiles/ubuntu2404.docker
@@ -113,9 +113,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
python3-pip \
python3-setuptools \
python3-sphinx \
@@ -123,7 +120,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-tomli \
python3-venv \
python3-wheel \
- python3-yaml \
rpm2cpio \
rustc-1.83 \
sed \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 7d185cda3c..b3c9993672 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -91,11 +91,7 @@ packages:
- pkg-config
- pulseaudio
- python3
- - python3-numpy
- - python3-opencv
- - python3-pillow
- python3-pip
- - python3-PyYAML
- python3-setuptools
- python3-sphinx
- python3-sphinx-rtd-theme
diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json
index 08b6eb6155..dfa8b41a52 100644
--- a/tests/vm/generated/freebsd.json
+++ b/tests/vm/generated/freebsd.json
@@ -49,14 +49,10 @@
"ncurses",
"nettle",
"ninja",
- "opencv",
"pixman",
"pkgconf",
"png",
- "py311-numpy",
- "py311-pillow",
"py311-pip",
- "py311-pyyaml",
"py311-setuptools",
"py311-sphinx",
"py311-sphinx_rtd_theme",