[libvirt PATCH] ci: Refresh information

Andrea Bolognani posted 1 patch 3 years ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20210323151511.102620-1-abologna@redhat.com
There is a newer version of this series
ci/cirrus/freebsd-12.vars                             | 2 +-
ci/cirrus/freebsd-current.vars                        | 2 +-
ci/containers/centos-7.Dockerfile                     | 4 ++--
ci/containers/centos-8.Dockerfile                     | 4 ++--
ci/containers/centos-stream.Dockerfile                | 4 ++--
ci/containers/debian-10-cross-aarch64.Dockerfile      | 4 ++--
ci/containers/debian-10-cross-armv6l.Dockerfile       | 4 ++--
ci/containers/debian-10-cross-armv7l.Dockerfile       | 4 ++--
ci/containers/debian-10-cross-i686.Dockerfile         | 4 ++--
ci/containers/debian-10-cross-mips.Dockerfile         | 4 ++--
ci/containers/debian-10-cross-mips64el.Dockerfile     | 4 ++--
ci/containers/debian-10-cross-mipsel.Dockerfile       | 4 ++--
ci/containers/debian-10-cross-ppc64le.Dockerfile      | 4 ++--
ci/containers/debian-10-cross-s390x.Dockerfile        | 4 ++--
ci/containers/debian-10.Dockerfile                    | 4 ++--
ci/containers/debian-sid-cross-aarch64.Dockerfile     | 2 +-
ci/containers/debian-sid-cross-armv6l.Dockerfile      | 2 +-
ci/containers/debian-sid-cross-armv7l.Dockerfile      | 2 +-
ci/containers/debian-sid-cross-i686.Dockerfile        | 2 +-
ci/containers/debian-sid-cross-mips64el.Dockerfile    | 2 +-
ci/containers/debian-sid-cross-mipsel.Dockerfile      | 2 +-
ci/containers/debian-sid-cross-ppc64le.Dockerfile     | 2 +-
ci/containers/debian-sid-cross-s390x.Dockerfile       | 2 +-
ci/containers/debian-sid.Dockerfile                   | 2 +-
ci/containers/fedora-32.Dockerfile                    | 2 +-
ci/containers/fedora-33.Dockerfile                    | 2 +-
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 +--
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 +--
ci/containers/fedora-rawhide.Dockerfile               | 2 +-
ci/containers/opensuse-152.Dockerfile                 | 4 ++--
ci/containers/ubuntu-1804.Dockerfile                  | 4 ++--
ci/containers/ubuntu-2004.Dockerfile                  | 4 ++--
32 files changed, 48 insertions(+), 50 deletions(-)
[libvirt PATCH] ci: Refresh information
Posted by Andrea Bolognani 3 years ago
Notable changes:

  * HAL is no longer installed on FreeBSD;

  * the native version of libwsman is no longer installed in
    containers intended for cross-compilation;

  * Meson 0.55 is used instead of 0.54 when installing from
    PyPI.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
Test pipeline:

  https://gitlab.com/abologna/libvirt/-/pipelines/275067437

 ci/cirrus/freebsd-12.vars                             | 2 +-
 ci/cirrus/freebsd-current.vars                        | 2 +-
 ci/containers/centos-7.Dockerfile                     | 4 ++--
 ci/containers/centos-8.Dockerfile                     | 4 ++--
 ci/containers/centos-stream.Dockerfile                | 4 ++--
 ci/containers/debian-10-cross-aarch64.Dockerfile      | 4 ++--
 ci/containers/debian-10-cross-armv6l.Dockerfile       | 4 ++--
 ci/containers/debian-10-cross-armv7l.Dockerfile       | 4 ++--
 ci/containers/debian-10-cross-i686.Dockerfile         | 4 ++--
 ci/containers/debian-10-cross-mips.Dockerfile         | 4 ++--
 ci/containers/debian-10-cross-mips64el.Dockerfile     | 4 ++--
 ci/containers/debian-10-cross-mipsel.Dockerfile       | 4 ++--
 ci/containers/debian-10-cross-ppc64le.Dockerfile      | 4 ++--
 ci/containers/debian-10-cross-s390x.Dockerfile        | 4 ++--
 ci/containers/debian-10.Dockerfile                    | 4 ++--
 ci/containers/debian-sid-cross-aarch64.Dockerfile     | 2 +-
 ci/containers/debian-sid-cross-armv6l.Dockerfile      | 2 +-
 ci/containers/debian-sid-cross-armv7l.Dockerfile      | 2 +-
 ci/containers/debian-sid-cross-i686.Dockerfile        | 2 +-
 ci/containers/debian-sid-cross-mips64el.Dockerfile    | 2 +-
 ci/containers/debian-sid-cross-mipsel.Dockerfile      | 2 +-
 ci/containers/debian-sid-cross-ppc64le.Dockerfile     | 2 +-
 ci/containers/debian-sid-cross-s390x.Dockerfile       | 2 +-
 ci/containers/debian-sid.Dockerfile                   | 2 +-
 ci/containers/fedora-32.Dockerfile                    | 2 +-
 ci/containers/fedora-33.Dockerfile                    | 2 +-
 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 +--
 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 +--
 ci/containers/fedora-rawhide.Dockerfile               | 2 +-
 ci/containers/opensuse-152.Dockerfile                 | 4 ++--
 ci/containers/ubuntu-1804.Dockerfile                  | 4 ++--
 ci/containers/ubuntu-2004.Dockerfile                  | 4 ++--
 32 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 5add0fb058..f50c3da65f 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PYTHON='/usr/local/bin/python3'
 PIP3='/usr/local/bin/pip-3.7'
-PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'
+PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 5add0fb058..f50c3da65f 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PYTHON='/usr/local/bin/python3'
 PIP3='/usr/local/bin/pip-3.7'
-PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'
+PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl'
diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile
index c499e7a19d..c71d1bcbcf 100644
--- a/ci/containers/centos-7.Dockerfile
+++ b/ci/containers/centos-7.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-7 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/centos:7
 
 RUN yum update -y && \
@@ -124,7 +124,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
index e600598329..21cf916d8d 100644
--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-8 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/centos:8
 
 RUN dnf update -y && \
@@ -96,7 +96,7 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile
index 2b51eccc8d..0e66d4ae99 100644
--- a/ci/containers/centos-stream.Dockerfile
+++ b/ci/containers/centos-stream.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-stream libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/centos:8
 
 RUN dnf install -y centos-release-stream && \
@@ -98,7 +98,7 @@ RUN dnf install -y centos-release-stream && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
index 272c809f17..31bf9fce7a 100644
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross aarch64 debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -118,7 +118,7 @@ cpu = 'aarch64'\n\
 endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
index e877b5e0b3..df0dd1b649 100644
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross armv6l debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'arm'\n\
 endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
index d8cbc82334..0b07fcaa2e 100644
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross armv7l debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -118,7 +118,7 @@ cpu = 'armhf'\n\
 endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
index ed056c31b5..9c3f2cdfd4 100644
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross i686 debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'i686'\n\
 endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
index 969964faf2..148b43f7e2 100644
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mips debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'mips'\n\
 endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
index a78492971f..df782b4b9b 100644
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mips64el debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'mips64el'\n\
 endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 857173f261..a61a9fc365 100644
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mipsel debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'mipsel'\n\
 endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index 349cc1e487..46aab91e28 100644
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross ppc64le debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 'powerpc64le'\n\
 endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
index e79381e69a..80f2564caf 100644
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross s390x debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -117,7 +117,7 @@ cpu = 's390x'\n\
 endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index bac8589f2c..ce4c27899a 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile debian-10 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -98,7 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index f0831c1fed..8ea2e6172d 100644
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross aarch64 debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index c3661e2e7d..cc5ca035de 100644
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross armv6l debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 4322046e8d..de53f630c9 100644
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross armv7l debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index a48ff3471c..3b351b58cb 100644
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross i686 debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 9f3325b546..56979fb07e 100644
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mips64el debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index 39993132ac..f7e9aa98d1 100644
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mipsel debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index ebb4389e69..149c5e26be 100644
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross ppc64le debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 8cc22358cf..61da0135c2 100644
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross s390x debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index a1ef98e67c..ce05150c09 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile debian-sid libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile
index 71d391b7bd..6ea7537006 100644
--- a/ci/containers/fedora-32.Dockerfile
+++ b/ci/containers/fedora-32.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-32 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.fedoraproject.org/fedora:32
 
 RUN dnf install -y nosync && \
diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile
index 5fb30380b0..aeddc7ec30 100644
--- a/ci/containers/fedora-33.Dockerfile
+++ b/ci/containers/fedora-33.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-33 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.fedoraproject.org/fedora:33
 
 RUN dnf install -y nosync && \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index c718778acb..a72b9a56f7 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@@ -35,7 +35,6 @@ exec "$@"' > /usr/bin/nosync && \
         iptables \
         iscsi-initiator-utils \
         kmod \
-        libwsman-devel \
         libxml2 \
         libxslt \
         lvm2 \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 6058d0c0b2..abcf18831b 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@@ -35,7 +35,6 @@ exec "$@"' > /usr/bin/nosync && \
         iptables \
         iscsi-initiator-utils \
         kmod \
-        libwsman-devel \
         libxml2 \
         libxslt \
         lvm2 \
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 027e8a7c41..fde3699202 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-rawhide libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile
index 00521f7796..2fba8969f6 100644
--- a/ci/containers/opensuse-152.Dockerfile
+++ b/ci/containers/opensuse-152.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile opensuse-152 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM registry.opensuse.org/opensuse/leap:15.2
 
 RUN zypper update -y && \
@@ -92,7 +92,7 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index 3d18274d00..9cfdc21594 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile ubuntu-1804 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/ubuntu:18.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 9018c9d22e..5616825c46 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile ubuntu-2004 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/891c7d56be1d0eb5adaf78fced7d1d882d6f0b6a
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/5bbc9986c2184aef7f5aee1fa7d262679fcde115
 FROM docker.io/library/ubuntu:20.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -99,7 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.55.3
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
-- 
2.26.3