On 14/10/2024 15.02, Daniel P. Berrangé wrote:
This addresses the py311-yaml -> py311-pyyaml rename in FreeBSD.
The change to the OpenSUSE dockerfile is something that will allow
QEMU to access rust bindgen in future.
Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
---
.gitlab-ci.d/cirrus/freebsd-14.vars | 2 +-
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/lcitool/libvirt-ci | 2 +-
tests/vm/generated/freebsd.json | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars
b/.gitlab-ci.d/cirrus/freebsd-14.vars
index aba0eff4b9..c0655b21e9 100644
--- a/.gitlab-ci.d/cirrus/freebsd-14.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-14.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl
cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls
gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs
libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle
ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-sphinx
py311-sphinx_rtd_theme py311-tomli py311-yaml python3 rpm2cpio sdl2 sdl2_image
snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso
zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl
cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls
gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs
libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle
ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml
py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio sdl2
sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer
vte3 xorriso zstd'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index a1c3b1cb75..e359a4e5c1 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -7,6 +7,7 @@
FROM registry.opensuse.org/opensuse/leap:15.6
RUN zypper update -y && \
+ zypper addrepo -fc
https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo
&& \
zypper install -y \
Mesa-devel \
alsa-lib-devel \
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index c0fc6fab5c..6b19006b2c 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit c0fc6fab5cdc839a70d4148aa9809504bc961967
+Subproject commit 6b19006b2cbe01adea6a857c71860a8e7ba7ddd7
diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json
index d5f0b62ec1..1eb2757c95 100644
--- a/tests/vm/generated/freebsd.json
+++ b/tests/vm/generated/freebsd.json
@@ -55,10 +55,10 @@
"py311-numpy",
"py311-pillow",
"py311-pip",
+ "py311-pyyaml",
"py311-sphinx",
"py311-sphinx_rtd_theme",
"py311-tomli",
- "py311-yaml",
"python3",
"rpm2cpio",
"sdl2",
Reviewed-by: Thomas Huth <th...@redhat.com>
