[libvirt PATCH v2] ci: Refresh information

Andrea Bolognani abologna at redhat.com
Thu Mar 25 12:53:27 UTC 2021


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 rather than 0.54 is requested when installing
    it from PyPI;

  * GNU sed and GNU grep are installed explicitly everywhere.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
Changes from [v1]:

  * install GNU grep and GNU sed everywhere.

I didn't push the original patch, even though it had already
been ACKed, to avoid unnecessary container rebuilds.

[v1] https://listman.redhat.com/archives/libvir-list/2021-March/msg01211.html

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

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 5add0fb058..115fd89727 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 gnugrep gnutls gsed 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..115fd89727 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 gnugrep gnutls gsed 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/macos-11.vars b/ci/cirrus/macos-11.vars
index c29b8b13b8..ba0e77d728 100644
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -5,4 +5,4 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PYTHON='/usr/local/bin/python3'
 PIP3='/usr/local/bin/pip3'
-PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile
index c499e7a19d..d1de34cedf 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/centos:7
 
 RUN yum update -y && \
@@ -64,6 +64,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         glibc-devel \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iptables \
         iscsi-initiator-utils \
@@ -111,6 +112,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         systemtap-sdt-devel \
         wireshark-devel \
         xen-devel \
@@ -124,7 +126,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..d55115fe29 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/centos:8
 
 RUN dnf update -y && \
@@ -35,6 +35,7 @@ RUN dnf update -y && \
         glibc-langpack-en \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iproute-tc \
         iptables \
@@ -84,6 +85,7 @@ RUN dnf update -y && \
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         systemtap-sdt-devel \
         wireshark-devel \
         xfsprogs-devel \
@@ -96,7 +98,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..a6715700c9 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/centos:8
 
 RUN dnf install -y centos-release-stream && \
@@ -37,6 +37,7 @@ RUN dnf install -y centos-release-stream && \
         glibc-langpack-en \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iproute-tc \
         iptables \
@@ -86,6 +87,7 @@ RUN dnf install -y centos-release-stream && \
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         systemtap-sdt-devel \
         wireshark-devel \
         xfsprogs-devel \
@@ -98,7 +100,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..50476a7f5c 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -118,7 +120,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..aed38f6f3d 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..714e28ad07 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -118,7 +120,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..7fcd38ff7b 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..09d0653e13 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..07ce89e16f 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..644b822302 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..f2e61268e9 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..e9b89c299a 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -48,6 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
@@ -117,7 +119,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..fbc06b3314 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:10-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             systemtap-sdt-dev \
             wireshark-dev \
             xfslibs-dev \
@@ -98,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/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index f0831c1fed..373b9ad31a 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index c3661e2e7d..e32d0fd230 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 4322046e8d..cc46822665 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index a48ff3471c..a4cd1c1070 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 9f3325b546..76298a7e4e 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index 39993132ac..3c69ce545f 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index ebb4389e69..c274e106a0 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 8cc22358cf..7d9120c93e 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -46,6 +47,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             xsltproc \
             zfs-fuse && \
     eatmydata apt-get autoremove -y && \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index a1ef98e67c..d1141ea307 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/debian:sid-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             systemtap-sdt-dev \
             wireshark-dev \
             xfslibs-dev \
diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile
index 71d391b7bd..71c78c76dc 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.fedoraproject.org/fedora:32
 
 RUN dnf install -y nosync && \
@@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \
         glibc-langpack-en \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iproute-tc \
         iptables \
@@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         sheepdog \
         systemtap-sdt-devel \
         wireshark-devel \
diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile
index 5fb30380b0..08cd40bc3a 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.fedoraproject.org/fedora:33
 
 RUN dnf install -y nosync && \
@@ -42,6 +42,7 @@ exec "$@"' > /usr/bin/nosync && \
         glibc-langpack-en \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iproute-tc \
         iptables \
@@ -89,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         sheepdog \
         systemtap-sdt-devel \
         wireshark-devel \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index c718778acb..1ac0c08e4c 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \
         firewalld-filesystem \
         git \
         glibc-langpack-en \
+        grep \
         iproute \
         iproute-tc \
         iptables \
         iscsi-initiator-utils \
         kmod \
-        libwsman-devel \
         libxml2 \
         libxslt \
         lvm2 \
@@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
+        sed \
         sheepdog \
         zfs-fuse && \
     nosync dnf autoremove -y && \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 6058d0c0b2..767e43639d 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@@ -30,12 +30,12 @@ exec "$@"' > /usr/bin/nosync && \
         firewalld-filesystem \
         git \
         glibc-langpack-en \
+        grep \
         iproute \
         iproute-tc \
         iptables \
         iscsi-initiator-utils \
         kmod \
-        libwsman-devel \
         libxml2 \
         libxslt \
         lvm2 \
@@ -55,6 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
+        sed \
         sheepdog \
         zfs-fuse && \
     nosync dnf autoremove -y && \
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 027e8a7c41..7cb68dcd50 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
@@ -43,6 +43,7 @@ exec "$@"' > /usr/bin/nosync && \
         glibc-langpack-en \
         glusterfs-api-devel \
         gnutls-devel \
+        grep \
         iproute \
         iproute-tc \
         iptables \
@@ -90,6 +91,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpm-build \
         sanlock-devel \
         scrub \
+        sed \
         sheepdog \
         systemtap-sdt-devel \
         wireshark-devel \
diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile
index 00521f7796..8688934e92 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM registry.opensuse.org/opensuse/leap:15.2
 
 RUN zypper update -y && \
@@ -31,6 +31,7 @@ RUN zypper update -y && \
            glibc-devel \
            glibc-locale \
            glusterfs-devel \
+           grep \
            iproute2 \
            iptables \
            kmod \
@@ -81,6 +82,7 @@ RUN zypper update -y && \
            rpm-build \
            sanlock-devel \
            scrub \
+           sed \
            systemtap-sdt-devel \
            wireshark-devel \
            xen-devel \
@@ -92,7 +94,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..55b7821cba 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/ubuntu:18.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gettext \
             git \
             glusterfs-common \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             sheepdog \
             systemtap-sdt-dev \
             wireshark-dev \
@@ -100,7 +102,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..04427b81d0 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/ceb381dce7c901e180a621951355800d8135ce82
 FROM docker.io/library/ubuntu:20.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             gcc \
             gettext \
             git \
+            grep \
             iproute2 \
             iptables \
             kmod \
@@ -84,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             qemu-utils \
             radvd \
             scrub \
+            sed \
             systemtap-sdt-dev \
             wireshark-dev \
             xfslibs-dev \
@@ -99,7 +101,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




More information about the libvir-list mailing list