ci: Refresh information

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@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 5add0fb058ef0216fdfa3250c2bca7931c2fa408..115fd897273e852ab4b6cd4eec5fc6dfce194d4a 100644 (file)
--- 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 5add0fb058ef0216fdfa3250c2bca7931c2fa408..115fd897273e852ab4b6cd4eec5fc6dfce194d4a 100644 (file)
--- 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 c29b8b13b8ace6b53a8278f25393faadf026fac0..ba0e77d7280155033dc1dbe0b1e1960d18a8a3ea 100644 (file)
--- 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 c499e7a19d60becf5172ebe67c9e9fd96e2be440..d1de34cedfb7633fb314734211a7e5d5e4ef30c1 100644 (file)
--- 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 e600598329d479c48577092d2180e479a13bc0b8..d55115fe291011e05e008803d7f1c4ae8402d17d 100644 (file)
--- 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 2b51eccc8d92493e619020a28d66406b35d77203..a6715700c91c06635ffa3bd6ff69ad33c2721e0a 100644 (file)
--- 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 272c809f17c3b29f88c7fec4895b526aef0aec73..50476a7f5c4e497ed378dc5a2554b6d1a9188a7c 100644 (file)
--- 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 e877b5e0b334500cc76417b3a1660ced234977b0..aed38f6f3dade6eaf1ee6f84981c4f6639909a6e 100644 (file)
--- 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 d8cbc823343338b069d702032a92392ccd937e07..714e28ad072804441911187c7078c598ac62566a 100644 (file)
--- 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 ed056c31b5ac596abe795f17aab4cc1a5d08b94b..7fcd38ff7b776b66b2e791e3d0eed8447cb63d29 100644 (file)
--- 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 969964faf2d52fcd3ba08d71bb7e5b4cb2403112..09d0653e136345f3641354ca405893aae40abd68 100644 (file)
--- 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 a78492971f0a88861e96caba83da8b5e5bfba60c..07ce89e16f44e731b42e0855525eb3ceba8fc007 100644 (file)
--- 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 857173f261c777ab5f6567da3743fa51ec08e745..644b822302ee2aaaf45c2b092e2f2f6ece5b49e2 100644 (file)
--- 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 349cc1e48704c69c1ef54de31cd87fedf764e643..f2e61268e923db8a1360725f8163c8b53ac930d9 100644 (file)
--- 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 e79381e69a638b4e8d17e869e79175d5cb5bdbbd..e9b89c299a3cc4dd7b0a5e431cf458545d470e67 100644 (file)
--- 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 bac8589f2c7bc185622ff27d20f72d70e79ef3d7..fbc06b3314c68466656d34b87f6e2acb37454002 100644 (file)
--- 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 f0831c1fed17f4422090b4b7f01379c64f8c6d21..373b9ad31a5b18a458bcfc9da546eb2c449437af 100644 (file)
--- 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 c3661e2e7d4ac3a1bfa851f990a1cf132c91cafb..e32d0fd230a7ad8e86d8101bb2793de7e216a656 100644 (file)
--- 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 4322046e8dac98d94fa1810aa8cb1db96a3d5852..cc4682266521d47812813fc46bb52f34f4ce2c5d 100644 (file)
--- 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 a48ff3471c2b931b529d374718b4bc989567dc9b..a4cd1c1070b82eb13ef47136683f64dc3a729fe4 100644 (file)
--- 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 9f3325b54633a162ad810adb1e6566fa1a868f98..76298a7e4e56f5f419afd0db6388ce18f3ff4af9 100644 (file)
--- 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 39993132ac479fcb4eb2ca8a0b6351ec1ee5b24e..3c69ce545ffb106a6bda2ee370d274dd1c6aa2a0 100644 (file)
--- 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 ebb4389e69783e06954fd0c756841c671f7013cc..c274e106a0760197bdfcd41c7a34bb41d269c1cb 100644 (file)
--- 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 8cc22358cf3780a68297c945e752b7acc1f1f352..7d9120c93e4e214bdafcac0c3b2a3968f57ffc54 100644 (file)
--- 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 a1ef98e67c1643b743faeeccfe20a496f8200db6..d1141ea30723ca7ae8d23df75d88ecd758701e68 100644 (file)
--- 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 71d391b7bd20716c6b132e38cc055f451bb0737a..71c78c76dcb94d49066f591a99f076adeaf11422 100644 (file)
--- 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 5fb30380b058c704c78e50f3e83c7f8eafab8c1c..08cd40bc3aebb18277e624cb6b4fea9cadc317c5 100644 (file)
--- 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 c718778acb9745298047a8e561b9fd032e9dd1c6..1ac0c08e4ce46e3b5c89f393e61f95be5dce87a5 100644 (file)
--- 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 6058d0c0b278cc01a933a26a76a564c843829aae..767e43639dcb643e69e2b0727a4587bd549ee0ae 100644 (file)
--- 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 027e8a7c415d26df2b0aee900ab4604c42b36b84..7cb68dcd50b07d347bba8a34bdca6f16743ab134 100644 (file)
--- 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 00521f7796b9c32e5e74da16b7589241d622c846..8688934e92a5a14ee29f68f9156027472235d9c2 100644 (file)
--- 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 3d18274d00677b2ee9018b59d57e07630deeec04..55b7821cba5809f1208009d5140d603df8ef488b 100644 (file)
--- 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 9018c9d22eb7cbb990c9395d5e41cf1f3e161cfa..04427b81d0aa0af8801d4d2f8852d9b52ae35022 100644 (file)
--- 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"