From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@mailo.com>,
"Warner Losh" <imp@bsdimp.com>,
"Kohei Tokunaga" <ktokunaga.mail@gmail.com>,
"Pierrick Bouvier" <pierrick.bouvier@oss.qualcomm.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"Kyle Evans" <kevans@freebsd.org>,
"Michael Roth" <michael.roth@amd.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@oss.qualcomm.com>
Subject: [PATCH v2 05/16] tests: re-add opencv2 and numpy dependencies
Date: Tue, 25 Aug 2026 01:14:30 -0400 [thread overview]
Message-ID: <20260825051441.1562454-6-jsnow@redhat.com> (raw)
In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com>
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>
---
tests/docker/dockerfiles/alpine.docker | 1 +
tests/docker/dockerfiles/centos9.docker | 2 ++
tests/docker/dockerfiles/debian-amd64-cross.docker | 2 ++
tests/docker/dockerfiles/debian-arm64-cross.docker | 2 ++
tests/docker/dockerfiles/debian-armhf-cross.docker | 2 ++
tests/docker/dockerfiles/debian-i686-cross.docker | 2 ++
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 ++
tests/docker/dockerfiles/debian-riscv64-cross.docker | 2 ++
tests/docker/dockerfiles/debian-s390x-cross.docker | 2 ++
tests/docker/dockerfiles/debian.docker | 2 ++
tests/docker/dockerfiles/fedora-rust-nightly.docker | 2 ++
tests/docker/dockerfiles/fedora-win64-cross.docker | 2 ++
tests/docker/dockerfiles/fedora.docker | 2 ++
tests/docker/dockerfiles/opensuse-leap.docker | 2 ++
tests/docker/dockerfiles/ubuntu2404.docker | 2 ++
.gitlab-ci.d/macos-14.vars | 2 +-
scripts/ci/setup/debian/debian-13-ppc64le.yaml | 2 ++
scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 2 ++
scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 2 ++
tests/lcitool/mappings.yml | 10 ++++++++++
tests/lcitool/projects/qemu.yml | 2 ++
tests/vm/generated/freebsd.json | 2 ++
22 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 8a5a355e89a..7c342e801c5 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 8101370a2db..6f5c400c2db 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 9e30457ca79..9b446a480b1 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 b9b94e5e6fa..95c757edb7c 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 aa412ff66f5..0c6287408ac 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 d07eac84fe8..99447e2e79b 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 7302c8236e4..534c9b55836 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 aa5a881cab2..0df92c80c05 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 82eae4fc2c2..12c94a40ec7 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 3a4f208ccf6..d808c945f46 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 0f3dc370a4f..0f7b4c13388 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 6f972f61738..3ed3e15df33 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 99bb38a3665..8fa8bea1abf 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 8d8631bbcf0..3174c2e3cc2 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 a5c22231f98..0918622e53d 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/.gitlab-ci.d/macos-14.vars b/.gitlab-ci.d/macos-14.vars
index 0c187624dd0..f96e173f663 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 9acd99a7433..918deeb6ad7 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 5c948109df8..38da57519d6 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 010b7f86aab..bae71c1cbc6 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/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index b576ded3edc..9bc87b4879f 100644
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -22,6 +22,9 @@ mappings:
CentOSStream9:
FreeBSD: py312-sphinx_rtd_theme
+ python3-opencv:
+ CentOSStream9:
+
python3-venv:
CentOSStream9: python3.11
@@ -30,6 +33,7 @@ mappings:
FreeBSD: py312-wheel
python3-numpy:
+ CentOSStream9:
FreeBSD: py312-numpy
meson:
@@ -60,3 +64,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 b3c99936723..abbd3e3f0b8 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 ee3402f0d2b..c35591b39d6 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",
--
2.55.0
next prev parent reply other threads:[~2026-08-25 5:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-25 5:14 [PATCH v2 00/16] python: require python3.12+ John Snow
2026-08-25 5:14 ` [PATCH v2 01/16] tests: update vm tests to prefer locally-built QEMU John Snow
2026-08-25 6:41 ` Markus Armbruster
2026-08-25 8:30 ` Daniel P. Berrangé
2026-08-25 15:15 ` John Snow
2026-08-25 11:26 ` Daniel P. Berrangé
2026-08-25 5:14 ` [PATCH v2 02/16] tests: update FreeBSD dependencies John Snow
2026-08-25 11:08 ` Daniel P. Berrangé
2026-08-25 15:07 ` John Snow
2026-08-25 5:14 ` [PATCH v2 03/16] tests: update netbsd dependencies John Snow
2026-08-25 6:26 ` Marc-André Lureau
2026-08-25 11:09 ` Daniel P. Berrangé
2026-08-25 15:11 ` John Snow
2026-08-25 5:14 ` [PATCH v2 04/16] tests: drop python3-devel mapping John Snow
2026-08-25 8:32 ` Daniel P. Berrangé
2026-08-25 5:14 ` John Snow [this message]
2026-08-25 5:14 ` [PATCH v2 06/16] tests: add Python3.12 to centos9.docker John Snow
2026-08-25 11:12 ` Daniel P. Berrangé
2026-08-25 5:14 ` [PATCH v2 07/16] tests: update emsdk-wasm64-cross John Snow
2026-08-25 5:14 ` [PATCH v2 08/16] qapi: update type hint for objects_seen John Snow
2026-08-25 5:14 ` [PATCH v2 09/16] python: upgrade to Python3.12+ John Snow
2026-08-25 11:14 ` Daniel P. Berrangé
2026-08-25 5:14 ` [PATCH v2 10/16] python: fix license configuration John Snow
2026-08-25 5:14 ` [PATCH v2 11/16] python: allow mypy to run as the current python version John Snow
2026-08-25 5:14 ` [PATCH v2 12/16] python: remove distutils workarounds John Snow
2026-08-25 5:14 ` [PATCH v2 13/16] python: remove stale setup.cfg options John Snow
2026-08-25 5:14 ` [PATCH v2 14/16] sphinx: require sphinx 7.2.6 John Snow
2026-08-25 5:14 ` [PATCH v2 15/16] sphinx: drop fakedbusdoc John Snow
2026-08-25 5:14 ` [PATCH v2 16/16] sphinx: drop qapidoc back-compat overboiled spaghetti dinner John Snow
2026-08-25 6:54 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260825051441.1562454-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=ktokunaga.mail@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=mchehab+huawei@kernel.org \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@mailo.com \
--cc=philmd@oss.qualcomm.com \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-devel@nongnu.org \
--cc=reinoud@netbsd.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.