Update libvirt-ci to current origin/master for the primary sake of grabbing new mappings for FreeBSD, which has upgraded from Python 3.11 to 3.12 and along with it changed the name of their python ecosystem packages.
Refresh the lcitool generated files to fix our FreeBSD tests. Signed-off-by: John Snow <[email protected]> --- 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/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2404.docker | 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/libvirt-ci | 2 +- tests/vm/generated/freebsd.json | 12 ++++++------ 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 9e30457ca79..e945e641e20 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -130,7 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:amd64 \ libsdl2-image-dev:amd64 \ libseccomp-dev:amd64 \ - libselinux1-dev:amd64 \ + libselinux-dev:amd64 \ libslirp-dev:amd64 \ libsnappy-dev:amd64 \ libsndio-dev:amd64 \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b9b94e5e6fa..0ee3a3f61c4 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -129,7 +129,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:arm64 \ libsdl2-image-dev:arm64 \ libseccomp-dev:arm64 \ - libselinux1-dev:arm64 \ + libselinux-dev:arm64 \ libslirp-dev:arm64 \ libsnappy-dev:arm64 \ libsndio-dev:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index aa412ff66f5..aacc1846801 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -128,7 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:armhf \ libsdl2-image-dev:armhf \ libseccomp-dev:armhf \ - libselinux1-dev:armhf \ + libselinux-dev:armhf \ libslirp-dev:armhf \ libsnappy-dev:armhf \ libsndio-dev:armhf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index d07eac84fe8..476031bd4db 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -128,7 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:i386 \ libsdl2-image-dev:i386 \ libseccomp-dev:i386 \ - libselinux1-dev:i386 \ + libselinux-dev:i386 \ libslirp-dev:i386 \ libsnappy-dev:i386 \ libsndio-dev:i386 \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 7302c8236e4..87e24d4dc0f 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -129,7 +129,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:ppc64el \ libsdl2-image-dev:ppc64el \ libseccomp-dev:ppc64el \ - libselinux1-dev:ppc64el \ + libselinux-dev:ppc64el \ libslirp-dev:ppc64el \ libsnappy-dev:ppc64el \ libsndio-dev:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index aa5a881cab2..d0a9805f864 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -129,7 +129,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:riscv64 \ libsdl2-image-dev:riscv64 \ libseccomp-dev:riscv64 \ - libselinux1-dev:riscv64 \ + libselinux-dev:riscv64 \ libslirp-dev:riscv64 \ libsnappy-dev:riscv64 \ libsndio-dev:riscv64 \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 82eae4fc2c2..179be9573d7 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -129,7 +129,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev:s390x \ libsdl2-image-dev:s390x \ libseccomp-dev:s390x \ - libselinux1-dev:s390x \ + libselinux-dev:s390x \ libslirp-dev:s390x \ libsnappy-dev:s390x \ libsndio-dev:s390x \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index 3a4f208ccf6..56605a42a2f 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -82,7 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev \ libsdl2-image-dev \ libseccomp-dev \ - libselinux1-dev \ + libselinux-dev \ libslirp-dev \ libsnappy-dev \ libsndio-dev \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 8d8631bbcf0..a634f39c1ec 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -7,7 +7,7 @@ FROM registry.opensuse.org/opensuse/leap:16.0 RUN zypper update -y && \ - zypper install -y \ + zypper install -y --allow-downgrade \ Mesa-devel \ alsa-lib-devel \ bash \ diff --git a/tests/docker/dockerfiles/ubuntu2404.docker b/tests/docker/dockerfiles/ubuntu2404.docker index a5c22231f98..d80f3a33d3b 100644 --- a/tests/docker/dockerfiles/ubuntu2404.docker +++ b/tests/docker/dockerfiles/ubuntu2404.docker @@ -82,7 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsdl2-dev \ libsdl2-image-dev \ libseccomp-dev \ - libselinux1-dev \ + libselinux-dev \ libslirp-dev \ libsnappy-dev \ libsndio-dev \ diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/setup/debian/debian-13-ppc64le.yaml index 9acd99a7433..c4d229830b6 100644 --- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml +++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml @@ -75,7 +75,7 @@ packages: - libsdl2-dev - libsdl2-image-dev - libseccomp-dev - - libselinux1-dev + - libselinux-dev - libslirp-dev - libsnappy-dev - libsndio-dev diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml index 5c948109df8..f6fa68d476f 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -75,7 +75,7 @@ packages: - libsdl2-dev - libsdl2-image-dev - libseccomp-dev - - libselinux1-dev + - libselinux-dev - libslirp-dev - libsnappy-dev - libsndio-dev diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml index 010b7f86aab..6c4cefe97e5 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -75,7 +75,7 @@ packages: - libsdl2-dev - libsdl2-image-dev - libseccomp-dev - - libselinux1-dev + - libselinux-dev - libslirp-dev - libsnappy-dev - libsndio-dev diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 5176e136ab1..76b5dd5b5c8 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 5176e136ab11e275eb9f57c3d5c80e77af6507cb +Subproject commit 76b5dd5b5c84511e2e799c2b3d6a2a9b9f6a081d diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json index dfa8b41a524..ee3402f0d2b 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -52,12 +52,12 @@ "pixman", "pkgconf", "png", - "py311-pip", - "py311-setuptools", - "py311-sphinx", - "py311-sphinx_rtd_theme", - "py311-tomli", - "py311-wheel", + "py312-pip", + "py312-setuptools", + "py312-sphinx", + "py312-sphinx_rtd_theme", + "py312-tomli", + "py312-wheel", "python3", "rpm2cpio", "rust", -- 2.55.0
