Commit 0ba1e07376 for qemu.org
commit 0ba1e0737612ecdf6ae505ea0a30c4d75cb0caba
Author: John Snow <jsnow@redhat.com>
Date: Tue Aug 25 17:58:40 2026 -0400
tests: re-add opencv2 and numpy dependencies
Fixes: 2a428c8541ec5e9be54aad5f0a446ec8172226c9
Some of the dependencies identified as avocado dependencies were in
fact still being used, and should be re-added to our lcitool
configuration to ensure that these tests are being executed in the CI
environment.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Message-ID: <20260825215851.1780608-6-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
diff --git a/.gitlab-ci.d/macos-14.vars b/.gitlab-ci.d/macos-14.vars
index 0c187624dd..f96e173f66 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='sphinx sphinx-rtd-theme tomli'
+PYPI_PKGS='numpy 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 c4d229830b..86c6d8bac0 100644
--- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml
+++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml
@@ -105,6 +105,8 @@ packages:
- openssh-client
- pkgconf
- python3
+ - python3-numpy
+ - python3-opencv
- python3-pip
- python3-setuptools
- python3-sphinx
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
index f6fa68d476..cbdc56369f 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
@@ -106,6 +106,8 @@ packages:
- openssh-client
- pkgconf
- python3
+ - python3-numpy
+ - python3-opencv
- python3-pip
- python3-setuptools
- python3-sphinx
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
index 6c4cefe97e..2ce5653720 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
@@ -104,6 +104,8 @@ packages:
- openssh-client
- pkgconf
- python3
+ - python3-numpy
+ - python3-opencv
- python3-pip
- python3-setuptools
- python3-sphinx
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 8a5a355e89..7c342e801c 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -83,6 +83,7 @@ RUN apk update && \
pixman-dev \
pkgconf \
pulseaudio-dev \
+ py3-numpy \
py3-pip \
py3-setuptools \
py3-sphinx \
diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker
index 8101370a2d..6f5c400c2d 100644
--- a/tests/docker/dockerfiles/centos9.docker
+++ b/tests/docker/dockerfiles/centos9.docker
@@ -130,6 +130,8 @@ RUN dnf --quiet distro-sync -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3.11 install \
+ numpy \
+ opencv-python \
sphinx \
sphinx-rtd-theme
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index e945e641e2..975b9f346e 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 0ee3a3f61c..3efce40482 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index aacc184680..91e8587b5d 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index 476031bd4d..a60b72e05b 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 87e24d4dc0..a7599b4f61 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index d0a9805f86..52661d4d9e 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 179be9573d..0a04777b36 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index 56605a42a2..77869f7154 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -113,6 +113,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker
index 0f3dc370a4..0f7b4c1338 100644
--- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
+++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@@ -104,6 +104,8 @@ exec "$@"\n' > /usr/bin/nosync && \
pkgconfig \
pulseaudio-libs-devel \
python3 \
+ python3-numpy \
+ python3-opencv \
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 6f972f6173..3ed3e15df3 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -44,6 +44,8 @@ exec "$@"\n' > /usr/bin/nosync && \
ninja-build \
openssh-clients \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 99bb38a366..8fa8bea1ab 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -104,6 +104,8 @@ exec "$@"\n' > /usr/bin/nosync && \
pkgconfig \
pulseaudio-libs-devel \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index a634f39c1e..3a3d6f73c8 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -95,6 +95,8 @@ RUN zypper update -y && \
pkgconfig \
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 d80f3a33d3..bb8f4e4e53 100644
--- a/tests/docker/dockerfiles/ubuntu2404.docker
+++ b/tests/docker/dockerfiles/ubuntu2404.docker
@@ -113,6 +113,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
openssh-client \
pkgconf \
python3 \
+ python3-numpy \
+ python3-opencv \
python3-pip \
python3-setuptools \
python3-sphinx \
diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index d2d4061316..cb56cdb3da 100644
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -18,12 +18,18 @@ mappings:
python3-sphinx-rtd-theme:
CentOSStream9:
+ python3-opencv:
+ CentOSStream9:
+
python3-venv:
CentOSStream9: python3.11
python3-wheel:
CentOSStream9: python3.11-wheel
+ python3-numpy:
+ CentOSStream9:
+
meson:
# Use Meson from PyPI wherever Rust is enabled
Debian:
@@ -51,3 +57,9 @@ pypi_mappings:
apk:
Fedora:
Debian12:
+
+ python3-numpy:
+ CentOSStream9: numpy
+
+ python3-opencv:
+ CentOSStream9: opencv-python
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index b3c9993672..abbd3e3f0b 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -91,6 +91,8 @@ packages:
- pkg-config
- pulseaudio
- python3
+ - python3-numpy
+ - python3-opencv
- python3-pip
- python3-setuptools
- python3-sphinx
diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json
index ee3402f0d2..c35591b39d 100644
--- a/tests/vm/generated/freebsd.json
+++ b/tests/vm/generated/freebsd.json
@@ -49,9 +49,11 @@
"ncurses",
"nettle",
"ninja",
+ "opencv",
"pixman",
"pkgconf",
"png",
+ "py312-numpy",
"py312-pip",
"py312-setuptools",
"py312-sphinx",