ci: refresh with 'lcitool manifest'

This replaces Fedora 39 with Fedora 41, updates the FreeBSD
Cirrus CI image names, and tweaks some package names

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh
index 6600b73e7470e044f3b1c1fc8817930d12552d7f..a52164a85110870e94138cd8cf3e0201e6ef910e 100644 (file)
--- a/ci/buildenv/debian-11-cross-aarch64.sh
+++ b/ci/buildenv/debian-11-cross-aarch64.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:arm64 \
             libsasl2-dev:arm64 \
             libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
+            libssh-dev:arm64 \
             libssh2-1-dev:arm64 \
             libtirpc-dev:arm64 \
             libudev-dev:arm64 \

diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh
index 761d813df02d1133968249f247d04aef4a1baa9d..caef8e80a4a8c17b50202939acddd5a4635c4002 100644 (file)
--- a/ci/buildenv/debian-11-cross-armv6l.sh
+++ b/ci/buildenv/debian-11-cross-armv6l.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:armel \
             libsasl2-dev:armel \
             libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
+            libssh-dev:armel \
             libssh2-1-dev:armel \
             libtirpc-dev:armel \
             libudev-dev:armel \

diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh
index 6c016bd90b01bc1dbbaee1a4a0c5db30e82e39d9..81d92e6386902c521f0ded2e5d872c50e9524976 100644 (file)
--- a/ci/buildenv/debian-11-cross-armv7l.sh
+++ b/ci/buildenv/debian-11-cross-armv7l.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:armhf \
             libsasl2-dev:armhf \
             libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
+            libssh-dev:armhf \
             libssh2-1-dev:armhf \
             libtirpc-dev:armhf \
             libudev-dev:armhf \

diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh
index b9705f1c3c79ea9742c17c85e09763658f19111b..7ab7242654758ff1436ad06793333685ffe03b87 100644 (file)
--- a/ci/buildenv/debian-11-cross-i686.sh
+++ b/ci/buildenv/debian-11-cross-i686.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:i386 \
             libsasl2-dev:i386 \
             libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
+            libssh-dev:i386 \
             libssh2-1-dev:i386 \
             libtirpc-dev:i386 \
             libudev-dev:i386 \

diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh
index 065c61ba5777947b166ae292bb616eb1fe176d3e..f983ab2981e6a31cce378ac1ad621ea49be3f85e 100644 (file)
--- a/ci/buildenv/debian-11-cross-mips64el.sh
+++ b/ci/buildenv/debian-11-cross-mips64el.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:mips64el \
             libsasl2-dev:mips64el \
             libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
+            libssh-dev:mips64el \
             libssh2-1-dev:mips64el \
             libtirpc-dev:mips64el \
             libudev-dev:mips64el \

diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh
index 89a0a8904b2d0ccbe3db3999183eaebe81f6b6b9..55a99b861f650c699a3854ea27d4a94fbba99ef4 100644 (file)
--- a/ci/buildenv/debian-11-cross-mipsel.sh
+++ b/ci/buildenv/debian-11-cross-mipsel.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:mipsel \
             libsasl2-dev:mipsel \
             libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
+            libssh-dev:mipsel \
             libssh2-1-dev:mipsel \
             libtirpc-dev:mipsel \
             libudev-dev:mipsel \

diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh
index c898939f098440cf59c517efdd288dbd5a4edc7a..b7d26e67fd79ed08986b5f57d6df3c74b40c1692 100644 (file)
--- a/ci/buildenv/debian-11-cross-ppc64le.sh
+++ b/ci/buildenv/debian-11-cross-ppc64le.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:ppc64el \
             libsasl2-dev:ppc64el \
             libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
+            libssh-dev:ppc64el \
             libssh2-1-dev:ppc64el \
             libtirpc-dev:ppc64el \
             libudev-dev:ppc64el \

diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh
index f1b94ac8725226659ef19f52b281da4ce43080ce..ac259c562563eac3a2d8bee1e416f7368dbb0a71 100644 (file)
--- a/ci/buildenv/debian-11-cross-s390x.sh
+++ b/ci/buildenv/debian-11-cross-s390x.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:s390x \
             libsasl2-dev:s390x \
             libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
+            libssh-dev:s390x \
             libssh2-1-dev:s390x \
             libtirpc-dev:s390x \
             libudev-dev:s390x \

diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh
index 9ba9e80183beb2f47493189818046e145bfa7245..affdf6e445f97b31446f2b7ad513efbe7148d6d6 100644 (file)
--- a/ci/buildenv/debian-11.sh
+++ b/ci/buildenv/debian-11.sh
@@ -57,7 +57,7 @@ function install_buildenv() {
             libsanlock-dev \
             libsasl2-dev \
             libselinux1-dev \
-            libssh-gcrypt-dev \
+            libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
             libudev-dev \

diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh
index b4a056d940ae1adebf91e5c3bfe94198022dcfab..1d69c099a4c3cfaf141733e259e303591470a9f2 100644 (file)
--- a/ci/buildenv/debian-12-cross-aarch64.sh
+++ b/ci/buildenv/debian-12-cross-aarch64.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:arm64 \
             libsasl2-dev:arm64 \
             libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
+            libssh-dev:arm64 \
             libssh2-1-dev:arm64 \
             libtirpc-dev:arm64 \
             libudev-dev:arm64 \

diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh
index 07ffb3da37cc4efb934b3921d7fb05472dfd7377..db2ee46af56b4843b296813a856f39678b361793 100644 (file)
--- a/ci/buildenv/debian-12-cross-armv6l.sh
+++ b/ci/buildenv/debian-12-cross-armv6l.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:armel \
             libsasl2-dev:armel \
             libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
+            libssh-dev:armel \
             libssh2-1-dev:armel \
             libtirpc-dev:armel \
             libudev-dev:armel \

diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh
index 6f88f6cc066655917c36d3abc6f9d3c03bc6b8b4..9ab435d0d790d4f9a75135ed7bf2ce21c035d290 100644 (file)
--- a/ci/buildenv/debian-12-cross-armv7l.sh
+++ b/ci/buildenv/debian-12-cross-armv7l.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:armhf \
             libsasl2-dev:armhf \
             libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
+            libssh-dev:armhf \
             libssh2-1-dev:armhf \
             libtirpc-dev:armhf \
             libudev-dev:armhf \

diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh
index 5da816d0866d9257000afa1a18583b7d1cf751e7..fbc6da5dd4b65fd5a4b212a6eec382a224eb79e1 100644 (file)
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:i386 \
             libsasl2-dev:i386 \
             libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
+            libssh-dev:i386 \
             libssh2-1-dev:i386 \
             libtirpc-dev:i386 \
             libudev-dev:i386 \

diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh
index 09c445758c2d4e2eea3a74a7116bbeca9ea1f582..f7067dfeb35aeb2689a2d6b91be57a0bcc9ebb00 100644 (file)
--- a/ci/buildenv/debian-12-cross-mips64el.sh
+++ b/ci/buildenv/debian-12-cross-mips64el.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:mips64el \
             libsasl2-dev:mips64el \
             libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
+            libssh-dev:mips64el \
             libssh2-1-dev:mips64el \
             libtirpc-dev:mips64el \
             libudev-dev:mips64el \

diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh
index a762d1e3b8dc8259082c09bf378eeb0654064ad2..6dd5333ae4de9280bf8279abfcc04a5f6e296e8b 100644 (file)
--- a/ci/buildenv/debian-12-cross-mipsel.sh
+++ b/ci/buildenv/debian-12-cross-mipsel.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:mipsel \
             libsasl2-dev:mipsel \
             libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
+            libssh-dev:mipsel \
             libssh2-1-dev:mipsel \
             libtirpc-dev:mipsel \
             libudev-dev:mipsel \

diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh
index fe7b67279956eda3fdea45769c8d953cc0d67396..97de655904f3302344c32c74a6363cd37bca77b0 100644 (file)
--- a/ci/buildenv/debian-12-cross-ppc64le.sh
+++ b/ci/buildenv/debian-12-cross-ppc64le.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:ppc64el \
             libsasl2-dev:ppc64el \
             libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
+            libssh-dev:ppc64el \
             libssh2-1-dev:ppc64el \
             libtirpc-dev:ppc64el \
             libudev-dev:ppc64el \

diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh
index 1ca0768d14ba019c5493a81992495d56e3e12b3e..725d1ee11346abad20ad89fdcf6340d2910211b9 100644 (file)
--- a/ci/buildenv/debian-12-cross-s390x.sh
+++ b/ci/buildenv/debian-12-cross-s390x.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:s390x \
             libsasl2-dev:s390x \
             libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
+            libssh-dev:s390x \
             libssh2-1-dev:s390x \
             libtirpc-dev:s390x \
             libudev-dev:s390x \

diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh
index fcd5291f22245053f386a4a55fed214b5a560caa..5e5b759f080416fd102b62cc9298ca753059c96a 100644 (file)
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@@ -57,7 +57,7 @@ function install_buildenv() {
             libsanlock-dev \
             libsasl2-dev \
             libselinux1-dev \
-            libssh-gcrypt-dev \
+            libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
             libudev-dev \

diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh
index b4a056d940ae1adebf91e5c3bfe94198022dcfab..1d69c099a4c3cfaf141733e259e303591470a9f2 100644 (file)
--- a/ci/buildenv/debian-sid-cross-aarch64.sh
+++ b/ci/buildenv/debian-sid-cross-aarch64.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:arm64 \
             libsasl2-dev:arm64 \
             libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
+            libssh-dev:arm64 \
             libssh2-1-dev:arm64 \
             libtirpc-dev:arm64 \
             libudev-dev:arm64 \

diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh
index 53d2d79b3869868762131b13765de2411e65eddc..ac03caeb5c7f3d5f644c4d0a6ba2201a2742e1e8 100644 (file)
--- a/ci/buildenv/debian-sid-cross-armv6l.sh
+++ b/ci/buildenv/debian-sid-cross-armv6l.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:armel \
             libsasl2-dev:armel \
             libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
+            libssh-dev:armel \
             libssh2-1-dev:armel \
             libtirpc-dev:armel \
             libudev-dev:armel \

diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh
index 4e60877e77956aa352a5146ef6ea520238d7af6f..c540104cb0c7ee2eebfc0c649ba0eb5a200bddd2 100644 (file)
--- a/ci/buildenv/debian-sid-cross-armv7l.sh
+++ b/ci/buildenv/debian-sid-cross-armv7l.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:armhf \
             libsasl2-dev:armhf \
             libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
+            libssh-dev:armhf \
             libssh2-1-dev:armhf \
             libtirpc-dev:armhf \
             libudev-dev:armhf \

diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh
index 98e08b2397d8c6418c9ecf061377c8458d49adf1..b558576fca350e4de6adfeaf0fe4ab22e632d85a 100644 (file)
--- a/ci/buildenv/debian-sid-cross-i686.sh
+++ b/ci/buildenv/debian-sid-cross-i686.sh
@@ -82,7 +82,7 @@ function install_buildenv() {
             libsanlock-dev:i386 \
             libsasl2-dev:i386 \
             libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
+            libssh-dev:i386 \
             libssh2-1-dev:i386 \
             libtirpc-dev:i386 \
             libudev-dev:i386 \

diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh
index 09c445758c2d4e2eea3a74a7116bbeca9ea1f582..f7067dfeb35aeb2689a2d6b91be57a0bcc9ebb00 100644 (file)
--- a/ci/buildenv/debian-sid-cross-mips64el.sh
+++ b/ci/buildenv/debian-sid-cross-mips64el.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:mips64el \
             libsasl2-dev:mips64el \
             libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
+            libssh-dev:mips64el \
             libssh2-1-dev:mips64el \
             libtirpc-dev:mips64el \
             libudev-dev:mips64el \

diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh
index fe7b67279956eda3fdea45769c8d953cc0d67396..97de655904f3302344c32c74a6363cd37bca77b0 100644 (file)
--- a/ci/buildenv/debian-sid-cross-ppc64le.sh
+++ b/ci/buildenv/debian-sid-cross-ppc64le.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:ppc64el \
             libsasl2-dev:ppc64el \
             libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
+            libssh-dev:ppc64el \
             libssh2-1-dev:ppc64el \
             libtirpc-dev:ppc64el \
             libudev-dev:ppc64el \

diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh
index 1ca0768d14ba019c5493a81992495d56e3e12b3e..725d1ee11346abad20ad89fdcf6340d2910211b9 100644 (file)
--- a/ci/buildenv/debian-sid-cross-s390x.sh
+++ b/ci/buildenv/debian-sid-cross-s390x.sh
@@ -83,7 +83,7 @@ function install_buildenv() {
             libsanlock-dev:s390x \
             libsasl2-dev:s390x \
             libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
+            libssh-dev:s390x \
             libssh2-1-dev:s390x \
             libtirpc-dev:s390x \
             libudev-dev:s390x \

diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh
index fcd5291f22245053f386a4a55fed214b5a560caa..5e5b759f080416fd102b62cc9298ca753059c96a 100644 (file)
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@@ -57,7 +57,7 @@ function install_buildenv() {
             libsanlock-dev \
             libsasl2-dev \
             libselinux1-dev \
-            libssh-gcrypt-dev \
+            libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
             libudev-dev \

diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-41-cross-mingw32.sh
similarity index 98%
rename from ci/buildenv/fedora-40-cross-mingw32.sh
rename to ci/buildenv/fedora-41-cross-mingw32.sh
index 9104b2e20eafb4a5a4db27ec1ca9cea3f8e72103..b19f0dccb229ba1fc860cb7a7403c14662ac3eb9 100644 (file)
--- a/ci/buildenv/fedora-40-cross-mingw32.sh
+++ b/ci/buildenv/fedora-41-cross-mingw32.sh
@@ -8,7 +8,7 @@ function install_buildenv() {
     dnf update -y
     dnf install -y \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         codespell \

diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-41-cross-mingw64.sh
similarity index 98%
rename from ci/buildenv/fedora-40-cross-mingw64.sh
rename to ci/buildenv/fedora-41-cross-mingw64.sh
index 35120064ec08d6d85d0aaed6b9e51336616ac843..20dca703b5005e15a1ebb6176dad61c939f594dd 100644 (file)
--- a/ci/buildenv/fedora-40-cross-mingw64.sh
+++ b/ci/buildenv/fedora-41-cross-mingw64.sh
@@ -8,7 +8,7 @@ function install_buildenv() {
     dnf update -y
     dnf install -y \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         codespell \

diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-41.sh
similarity index 97%
rename from ci/buildenv/fedora-39.sh
rename to ci/buildenv/fedora-41.sh
index e45ac2230f26c2ba82bb6b03b163d1308462e682..c32a689fbd0c8c531345fa63ec909ac4d630ad0f 100644 (file)
--- a/ci/buildenv/fedora-39.sh
+++ b/ci/buildenv/fedora-41.sh
@@ -9,7 +9,7 @@ function install_buildenv() {
     dnf install -y \
         audit-libs-devel \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         clang \
@@ -82,6 +82,7 @@ function install_buildenv() {
         systemd-devel \
         systemd-rpm-macros \
         systemtap-sdt-devel \
+        systemtap-sdt-dtrace \
         wireshark-devel \
         xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index fbcd6130956f1c924573b44b03b8ff16466a95e5..56b66e3b2aec9634df1569caddc1dc7ec50d85ec 100644 (file)
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.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='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
+PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'

diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars
index 3002987cbdd8b80943a89fea4cea8ebc726ae2c3..fb665d16ee404fbf8a6fb07a96ef339c24adb140 100644 (file)
--- a/ci/cirrus/freebsd-14.vars
+++ b/ci/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'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
+PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'

diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile
index f8d4ea8ed2ce53444646e5a30d85769b06e2b1a1..79c359f9fa50b3e243736b529e81d8661618c693 100644 (file)
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:arm64 \
                       libsasl2-dev:arm64 \
                       libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
+                      libssh-dev:arm64 \
                       libssh2-1-dev:arm64 \
                       libtirpc-dev:arm64 \
                       libudev-dev:arm64 \

diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile
index f9741630000d7e21b55dab94e173d1d683564c3c..27bd6c578b32377ddb574eee76857cbf5ec52e32 100644 (file)
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armel \
                       libsasl2-dev:armel \
                       libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
+                      libssh-dev:armel \
                       libssh2-1-dev:armel \
                       libtirpc-dev:armel \
                       libudev-dev:armel \

diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile
index ced175c7c002c34e2f3340716b87b6e0456a5167..3b413673a60cc5192e91e9a3b8818075d160dd97 100644 (file)
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armhf \
                       libsasl2-dev:armhf \
                       libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
+                      libssh-dev:armhf \
                       libssh2-1-dev:armhf \
                       libtirpc-dev:armhf \
                       libudev-dev:armhf \

diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile
index c1ee60f3b6cf58c8414fd37b09d612733b85e84d..ab5173f2f1e5a5500593c42dc148e5ab4b7b1f6c 100644 (file)
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:i386 \
                       libsasl2-dev:i386 \
                       libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
+                      libssh-dev:i386 \
                       libssh2-1-dev:i386 \
                       libtirpc-dev:i386 \
                       libudev-dev:i386 \

diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile
index 98c40beef4c2e01fff674d60b7b5fbe414bd6c41..04fa68f6885b5c6acaa511d96c14297d9e2d7575 100644 (file)
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
+                      libssh-dev:mips64el \
                       libssh2-1-dev:mips64el \
                       libtirpc-dev:mips64el \
                       libudev-dev:mips64el \

diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile
index e3531a9fac86a223e321a0f57e17e03660133793..558382ad25d385c3fad4496a426ebfce039932ba 100644 (file)
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mipsel \
                       libsasl2-dev:mipsel \
                       libselinux1-dev:mipsel \
-                      libssh-gcrypt-dev:mipsel \
+                      libssh-dev:mipsel \
                       libssh2-1-dev:mipsel \
                       libtirpc-dev:mipsel \
                       libudev-dev:mipsel \

diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile
index 8f9f7299096878da01e5d34a556e31762d573233..ed68e8f0af2d13e9d4f60eb4bfa99123eac10a86 100644 (file)
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:ppc64el \
                       libsasl2-dev:ppc64el \
                       libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
+                      libssh-dev:ppc64el \
                       libssh2-1-dev:ppc64el \
                       libtirpc-dev:ppc64el \
                       libudev-dev:ppc64el \

diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile
index b09076b148cc046403639ff046ba6876016a4a1c..62791ac154e3fcd3a4f0597d1cda34adebdc459b 100644 (file)
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:s390x \
                       libsasl2-dev:s390x \
                       libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
+                      libssh-dev:s390x \
                       libssh2-1-dev:s390x \
                       libtirpc-dev:s390x \
                       libudev-dev:s390x \

diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile
index 1660bd9c52d94fbaa27e954102435fe7f7b24f74..48c59e3aab88dc74df390556b529dd9d4147384b 100644 (file)
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev \
                       libsasl2-dev \
                       libselinux1-dev \
-                      libssh-gcrypt-dev \
+                      libssh-dev \
                       libssh2-1-dev \
                       libtirpc-dev \
                       libudev-dev \

diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile
index f4d587177ba51ba807464efc63f6304484599952..ebccfbc203567732c2515c7003162ec483ac6514 100644 (file)
--- a/ci/containers/debian-12-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-12-cross-aarch64.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:arm64 \
                       libsasl2-dev:arm64 \
                       libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
+                      libssh-dev:arm64 \
                       libssh2-1-dev:arm64 \
                       libtirpc-dev:arm64 \
                       libudev-dev:arm64 \

diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile
index d8f2a3bc422fedaab18b42ec2f59dbf70284fb45..a6f51c80fd586f1cd973baab4d70e841795121ff 100644 (file)
--- a/ci/containers/debian-12-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv6l.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armel \
                       libsasl2-dev:armel \
                       libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
+                      libssh-dev:armel \
                       libssh2-1-dev:armel \
                       libtirpc-dev:armel \
                       libudev-dev:armel \

diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile
index 1abfb7993157206f806ed3b2a3d0e69853cf266e..132938ce102c5a0b59071afdab0c2765ea4f49a7 100644 (file)
--- a/ci/containers/debian-12-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv7l.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armhf \
                       libsasl2-dev:armhf \
                       libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
+                      libssh-dev:armhf \
                       libssh2-1-dev:armhf \
                       libtirpc-dev:armhf \
                       libudev-dev:armhf \

diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile
index 5681121d80793c4739030fc3cf6a2d1e33aab801..3a76ee4e7685f14f69570f229589d5cc5805a1ec 100644 (file)
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:i386 \
                       libsasl2-dev:i386 \
                       libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
+                      libssh-dev:i386 \
                       libssh2-1-dev:i386 \
                       libtirpc-dev:i386 \
                       libudev-dev:i386 \

diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile
index a4f2aabe10cc3c49ae65d0fab24226c802591da2..c8009062ef3baa717b4c799db29ca23bf0628f26 100644 (file)
--- a/ci/containers/debian-12-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-12-cross-mips64el.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
+                      libssh-dev:mips64el \
                       libssh2-1-dev:mips64el \
                       libtirpc-dev:mips64el \
                       libudev-dev:mips64el \

diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile
index a3f0652818ee8163726df7ea88701bf8cb58dcde..efb4639a2648ee80adf8cc087a231bd7ca2d6775 100644 (file)
--- a/ci/containers/debian-12-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-12-cross-mipsel.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mipsel \
                       libsasl2-dev:mipsel \
                       libselinux1-dev:mipsel \
-                      libssh-gcrypt-dev:mipsel \
+                      libssh-dev:mipsel \
                       libssh2-1-dev:mipsel \
                       libtirpc-dev:mipsel \
                       libudev-dev:mipsel \

diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile
index caf8229a8e7dfbb54b3955e2b3ef371395d588ab..3b0cfab7ef69b0f86dfb2fc366afc72d4e031850 100644 (file)
--- a/ci/containers/debian-12-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:ppc64el \
                       libsasl2-dev:ppc64el \
                       libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
+                      libssh-dev:ppc64el \
                       libssh2-1-dev:ppc64el \
                       libtirpc-dev:ppc64el \
                       libudev-dev:ppc64el \

diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile
index c4f8479c13a7c114b22fd1b648b66fee6c0cb887..c730b44e038a51db45d9a35f11d4ee819b2c372d 100644 (file)
--- a/ci/containers/debian-12-cross-s390x.Dockerfile
+++ b/ci/containers/debian-12-cross-s390x.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:s390x \
                       libsasl2-dev:s390x \
                       libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
+                      libssh-dev:s390x \
                       libssh2-1-dev:s390x \
                       libtirpc-dev:s390x \
                       libudev-dev:s390x \

diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile
index 3e6d0597e227b11662bb1daa3e5e8a51a0546753..778f6962d9301efa886fb839b48b86258c845291 100644 (file)
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev \
                       libsasl2-dev \
                       libselinux1-dev \
-                      libssh-gcrypt-dev \
+                      libssh-dev \
                       libssh2-1-dev \
                       libtirpc-dev \
                       libudev-dev \

diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 3a06f01c5c5e9988a2873d148952ff79dae417b3..2d0e4d8a9865e39d9ac2dd6e686c8dd39fa3727f 100644 (file)
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:arm64 \
                       libsasl2-dev:arm64 \
                       libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
+                      libssh-dev:arm64 \
                       libssh2-1-dev:arm64 \
                       libtirpc-dev:arm64 \
                       libudev-dev:arm64 \

diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index fdf129aa0418bba51201518ed869485c35169892..d3034c0131b383c11a821619a222226887dc374a 100644 (file)
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armel \
                       libsasl2-dev:armel \
                       libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
+                      libssh-dev:armel \
                       libssh2-1-dev:armel \
                       libtirpc-dev:armel \
                       libudev-dev:armel \

diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 8dbb705d690207f6ef7e1d08a7fc88435ce1fa3f..30234b6755f2d2bc40d88093276427a47326cbd5 100644 (file)
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armhf \
                       libsasl2-dev:armhf \
                       libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
+                      libssh-dev:armhf \
                       libssh2-1-dev:armhf \
                       libtirpc-dev:armhf \
                       libudev-dev:armhf \

diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index f856306a6284e5e0e32512f441871163ff07b211..2c2c4772c812fd764f290b3b612f212dbad928d2 100644 (file)
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:i386 \
                       libsasl2-dev:i386 \
                       libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
+                      libssh-dev:i386 \
                       libssh2-1-dev:i386 \
                       libtirpc-dev:i386 \
                       libudev-dev:i386 \

diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 468c5fbc3eac7c857f7aeadf543158a4acb8ee8b..0af87394ccb59741c3c508289f209ffba3d7a4e3 100644 (file)
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
+                      libssh-dev:mips64el \
                       libssh2-1-dev:mips64el \
                       libtirpc-dev:mips64el \
                       libudev-dev:mips64el \

diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 37c256fe1e427c4a84b3c81e42dc626ecd74b315..d91a84c65b4730ebf88278fc22bf267bdc9769c9 100644 (file)
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:ppc64el \
                       libsasl2-dev:ppc64el \
                       libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
+                      libssh-dev:ppc64el \
                       libssh2-1-dev:ppc64el \
                       libtirpc-dev:ppc64el \
                       libudev-dev:ppc64el \

diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 232a8d7844e58d6843c076cca91495f27e2798f7..147c5e992f736a1b9ed317d4a578cdab0135ec58 100644 (file)
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:s390x \
                       libsasl2-dev:s390x \
                       libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
+                      libssh-dev:s390x \
                       libssh2-1-dev:s390x \
                       libtirpc-dev:s390x \
                       libudev-dev:s390x \

diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index febd286d86b77bd930a4deb2e4b0b4addd0825c4..daa750324b9c2cafcf8f7799b4ed74cec1eaac30 100644 (file)
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev \
                       libsasl2-dev \
                       libselinux1-dev \
-                      libssh-gcrypt-dev \
+                      libssh-dev \
                       libssh2-1-dev \
                       libtirpc-dev \
                       libudev-dev \

diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-41-cross-mingw32.Dockerfile
similarity index 96%
rename from ci/containers/fedora-40-cross-mingw32.Dockerfile
rename to ci/containers/fedora-41-cross-mingw32.Dockerfile
index ed8566f273e40acf264bf0f3a02048d4bcaec995..6ab14be6fce89b4058c8f866a4882afee3fec5e3 100644 (file)
--- a/ci/containers/fedora-40-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-41-cross-mingw32.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:40
+FROM registry.fedoraproject.org/fedora:41
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf update -y && \
     nosync dnf install -y \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                codespell \

diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-41-cross-mingw64.Dockerfile
similarity index 96%
rename from ci/containers/fedora-40-cross-mingw64.Dockerfile
rename to ci/containers/fedora-41-cross-mingw64.Dockerfile
index b030427e0c9262097ef7e117acd7ea9d6e22e696..a0ec65d74a0e479bfa9605e914b169e83c5e6032 100644 (file)
--- a/ci/containers/fedora-40-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-41-cross-mingw64.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:40
+FROM registry.fedoraproject.org/fedora:41
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf update -y && \
     nosync dnf install -y \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                codespell \

diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-41.Dockerfile
similarity index 96%
rename from ci/containers/fedora-39.Dockerfile
rename to ci/containers/fedora-41.Dockerfile
index 2e35ca426db00b0063bbca9f8e815be009f572e0..a46f220de0bb1d488a89aa0edf0e0298da0e0c4c 100644 (file)
--- a/ci/containers/fedora-39.Dockerfile
+++ b/ci/containers/fedora-41.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora:41
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                audit-libs-devel \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                clang \
@@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                systemd-devel \
                systemd-rpm-macros \
                systemtap-sdt-devel \
+               systemtap-sdt-dtrace \
                wireshark-devel \
                xen-devel && \
     nosync dnf autoremove -y && \

diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 0daab1267668c46b27ba783cf77fc4956a8a3e03..0e6de9f36d0e015310d72c1350b8b07df8093f0d 100644 (file)
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -55,6 +55,7 @@
 
 variables:
   RUN_UPSTREAM_NAMESPACE: libvirt
+  CONTAINER_UPSTREAM_NAMESPACE: libvirt
   FF_SCRIPT_SECTIONS: 1
 
 

diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml
index 5ba91ffc673dc2d29306b018f382c1c00ae9cfc7..a4b76e06d077a86b8e739f2f600e2c475bc5c286 100644 (file)
--- a/ci/gitlab/build-templates.yml
+++ b/ci/gitlab/build-templates.yml
@@ -35,7 +35,7 @@
       fi
     - cat /packages.txt
   variables:
-    IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest
+    IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest
   rules:
     ### PUSH events
 
@@ -179,7 +179,7 @@
       fi
     - cat /packages.txt
   variables:
-    IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest
+    IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest
   rules:
     ### PUSH events
 

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 3e7f36802e15012a7882e5cbd7c9b40655feede5..9c2f0ecad84c4bc6d4d4c08fa9a4b58aee3c23d0 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -127,30 +127,30 @@ x86_64-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-x86_64-fedora-39:
+x86_64-fedora-40:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-39-container
+    - job: x86_64-fedora-40-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-39
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
+    NAME: fedora-40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
 
-x86_64-fedora-40:
+x86_64-fedora-41:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-40-container
+    - job: x86_64-fedora-41-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-40
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    NAME: fedora-41
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41
   artifacts:
     expire_in: 1 day
     paths:
@@ -544,29 +544,29 @@ s390x-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-mingw32-fedora-40:
+mingw32-fedora-41:
   extends: .cross_build_job
   needs:
-    - job: mingw32-fedora-40-container
+    - job: mingw32-fedora-41-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-40
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    NAME: fedora-41
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41
 
 
-mingw64-fedora-40:
+mingw64-fedora-41:
   extends: .cross_build_job
   needs:
-    - job: mingw64-fedora-40-container
+    - job: mingw64-fedora-41-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-40
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    NAME: fedora-41
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41
 
 
 mingw32-fedora-rawhide:
@@ -602,7 +602,7 @@ x86_64-freebsd-13:
   allow_failure:
     exit_codes: 3
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-13-3
+    CIRRUS_VM_IMAGE_NAME: freebsd-13-4
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y
@@ -617,7 +617,7 @@ x86_64-freebsd-14:
   allow_failure:
     exit_codes: 3
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-14-1
+    CIRRUS_VM_IMAGE_NAME: freebsd-14-2
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 55137dc1c37a3f5b91ee7eb284f00cde1f1a8c3c..0cfc8ca952e20612ae518c76911fd09535f89523 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -57,18 +57,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-39-container:
+x86_64-fedora-40-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-39
+    NAME: fedora-40
 
 
-x86_64-fedora-40-container:
+x86_64-fedora-41-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-40
+    NAME: fedora-41
 
 
 x86_64-fedora-rawhide-container:
@@ -292,19 +292,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-40-container:
+mingw32-fedora-41-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-40-cross-mingw32
+    NAME: fedora-41-cross-mingw32
 
 
-mingw64-fedora-40-container:
+mingw64-fedora-41-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-40-cross-mingw64
+    NAME: fedora-41-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:

diff --git a/ci/integration.yml b/ci/integration.yml
index 2fc8d0295679f29e823bb46326c74690acce8038..ced3fbc3c2532e4c2b47c8ebedb5e31fdf855d80 100644 (file)
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -29,23 +29,23 @@ centos-stream-9-tests:
 # and libvirt-python CI jobs, so the new target needs to be introduced
 # there before it can be used here. The VM template for the target
 # also needs to be created on the runner host.
-fedora-39-tests:
+fedora-40-tests:
   extends: .integration_tests
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-39
+    DISTRO: fedora-40
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
   needs:
-    - x86_64-fedora-39
+    - x86_64-fedora-40
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-39
+      job: x86_64-fedora-40
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-39
+      job: x86_64-fedora-40
       ref: master
       artifacts: true
 
@@ -53,22 +53,22 @@ fedora-39-tests:
 # and libvirt-python CI jobs, so the new target needs to be introduced
 # there before it can be used here. The VM template for the target
 # also needs to be created on the runner host.
-.fedora-39-upstream-qemu-tests:
+.fedora-40-upstream-qemu-tests:
   extends: .integration_tests
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-39
+    DISTRO: fedora-40
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
   needs:
-    - x86_64-fedora-39
+    - x86_64-fedora-40
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-39
+      job: x86_64-fedora-40
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-39
+      job: x86_64-fedora-40
       ref: master
       artifacts: true

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 43b999571740821657c555f3f3e0a6fbcb294f57..2c036aaa394b6a96f73170f903599b1c44716033 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -144,7 +144,7 @@ targets:
         containers: false
         builds: false
 
-  fedora-39:
+  fedora-40:
     jobs:
       - arch: x86_64
         artifacts:
@@ -152,7 +152,7 @@ targets:
           paths:
             - libvirt-rpms
 
-  fedora-40:
+  fedora-41:
     jobs:
       - arch: x86_64
         artifacts: