ci: refresh dockerfiles for changed libvirt build system

Libvirt changed from autotools to meson. All the containers need
refreshing and the CI recipes updated.

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

13 files changed, 150 insertions, 113 deletions

diff --git a/ci/libvirt-centos-7.Dockerfile b/ci/libvirt-centos-7.Dockerfile
index 74eba4e..72da1be 100644
--- a/ci/libvirt-centos-7.Dockerfile
+++ b/ci/libvirt-centos-7.Dockerfile
@@ -55,6 +55,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         ninja-build \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-pip \
@@ -67,7 +68,8 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         screen \
         strace \
         sudo \
-        vim && \
+        vim \
+        xz && \
     yum autoremove -y && \
     yum clean all -y && \
     mkdir -p /usr/libexec/ccache-wrappers && \
@@ -75,7 +77,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
 
diff --git a/ci/libvirt-centos-8.Dockerfile b/ci/libvirt-centos-8.Dockerfile
index 3d0eb68..8715f4e 100644
--- a/ci/libvirt-centos-8.Dockerfile
+++ b/ci/libvirt-centos-8.Dockerfile
@@ -1,7 +1,7 @@
 FROM centos:8
 
 RUN dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled PowerTools -y && \
+    dnf config-manager --set-enabled -y PowerTools && \
     dnf install -y epel-release && \
     dnf update -y && \
     dnf install -y \
@@ -30,17 +30,18 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         libxslt \
         lsof \
         make \
-        meson \
         net-tools \
         ninja-build \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-docutils \
         python3-lxml \
         python3-nose \
+        python3-pip \
         python3-setuptools \
         python3-wheel \
         rpcgen \
@@ -48,13 +49,17 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         screen \
         strace \
         sudo \
-        vim && \
+        vim \
+        xz && \
     dnf autoremove -y && \
     dnf clean all -y && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"
 
 ENV MAKE "/usr/bin/make"
diff --git a/ci/libvirt-centos-stream.Dockerfile b/ci/libvirt-centos-stream.Dockerfile
new file mode 100644
index 0000000..6549162
--- /dev/null
+++ b/ci/libvirt-centos-stream.Dockerfile
@@ -0,0 +1,61 @@
+FROM centos:8
+
+RUN dnf install -y centos-release-stream && \
+    dnf install 'dnf-command(config-manager)' -y && \
+    dnf config-manager --set-enabled -y Stream-PowerTools && \
+    dnf install -y epel-release && \
+    dnf update -y && \
+    dnf install -y \
+        autoconf \
+        automake \
+        bash \
+        bash-completion \
+        ca-certificates \
+        ccache \
+        chrony \
+        gcc \
+        gdb \
+        gettext \
+        gettext-devel \
+        git \
+        glibc-devel \
+        glibc-langpack-en \
+        libtool \
+        libvirt-devel \
+        lsof \
+        make \
+        net-tools \
+        ninja-build \
+        patch \
+        perl \
+        perl-App-cpanminus \
+        pkgconfig \
+        python3 \
+        python3-devel \
+        python3-lxml \
+        python3-nose \
+        python3-pip \
+        python3-setuptools \
+        python3-wheel \
+        rpm-build \
+        screen \
+        strace \
+        sudo \
+        vim \
+        xz && \
+    dnf autoremove -y && \
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+
+RUN pip3 install \
+         meson==0.54.0
+
+ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/libvirt-debian-10.Dockerfile b/ci/libvirt-debian-10.Dockerfile
index 0237461..e4c8df1 100644
--- a/ci/libvirt-debian-10.Dockerfile
+++ b/ci/libvirt-debian-10.Dockerfile
@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             gcc \
             gdb \
             gettext \
@@ -23,7 +24,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             locales \
             lsof \
             make \
-            meson \
             net-tools \
             ninja-build \
             patch \
@@ -33,12 +33,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-dev \
             python3-lxml \
             python3-nose \
+            python3-pip \
             python3-setuptools \
             python3-wheel \
             screen \
             strace \
             sudo \
-            vim && \
+            vim \
+            xz-utils && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -47,6 +49,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"
 
 ENV MAKE "/usr/bin/make"
diff --git a/ci/libvirt-debian-9.Dockerfile b/ci/libvirt-debian-9.Dockerfile
deleted file mode 100644
index 4b25f55..0000000
--- a/ci/libvirt-debian-9.Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            libc6-dev \
-            libtool \
-            libtool-bin \
-            libvirt-dev \
-            locales \
-            lsof \
-            make \
-            net-tools \
-            ninja-build \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-dev \
-            python3-lxml \
-            python3-nose \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            screen \
-            strace \
-            sudo \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
-
-RUN pip3 install \
-         meson==0.49.0
-
-ENV LANG "en_US.UTF-8"
-
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/libvirt-debian-sid.Dockerfile b/ci/libvirt-debian-sid.Dockerfile
index e75c478..726b3f2 100644
--- a/ci/libvirt-debian-sid.Dockerfile
+++ b/ci/libvirt-debian-sid.Dockerfile
@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             gcc \
             gdb \
             gettext \
@@ -33,12 +34,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-dev \
             python3-lxml \
             python3-nose \
+            python3-pip \
             python3-setuptools \
             python3-wheel \
             screen \
             strace \
             sudo \
-            vim && \
+            vim \
+            xz-utils && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
diff --git a/ci/libvirt-fedora-31.Dockerfile b/ci/libvirt-fedora-31.Dockerfile
index c1c7b01..f979a89 100644
--- a/ci/libvirt-fedora-31.Dockerfile
+++ b/ci/libvirt-fedora-31.Dockerfile
@@ -21,29 +21,34 @@ RUN dnf update -y && \
         libvirt-devel \
         lsof \
         make \
-        meson \
         net-tools \
         ninja-build \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
+        python3-pip \
         python3-setuptools \
         python3-wheel \
         rpm-build \
         screen \
         strace \
         sudo \
-        vim && \
+        vim \
+        xz && \
     dnf autoremove -y && \
     dnf clean all -y && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"
 
 ENV MAKE "/usr/bin/make"
diff --git a/ci/libvirt-fedora-32.Dockerfile b/ci/libvirt-fedora-32.Dockerfile
index 8de2ad7..81238ee 100644
--- a/ci/libvirt-fedora-32.Dockerfile
+++ b/ci/libvirt-fedora-32.Dockerfile
@@ -26,18 +26,21 @@ RUN dnf update -y && \
         ninja-build \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
+        python3-pip \
         python3-setuptools \
         python3-wheel \
         rpm-build \
         screen \
         strace \
         sudo \
-        vim && \
+        vim \
+        xz && \
     dnf autoremove -y && \
     dnf clean all -y && \
     mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/ci/libvirt-fedora-rawhide.Dockerfile b/ci/libvirt-fedora-rawhide.Dockerfile
index 0d5ca91..8a5f39c 100644
--- a/ci/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/libvirt-fedora-rawhide.Dockerfile
@@ -27,18 +27,21 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         ninja-build \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         python3 \
         python3-devel \
         python3-lxml \
         python3-nose \
+        python3-pip \
         python3-setuptools \
         python3-wheel \
         rpm-build \
         screen \
         strace \
         sudo \
-        vim && \
+        vim \
+        xz && \
     dnf autoremove -y && \
     dnf clean all -y && \
     mkdir -p /usr/libexec/ccache-wrappers && \
diff --git a/ci/libvirt-opensuse-151.Dockerfile b/ci/libvirt-opensuse-151.Dockerfile
index 6a5bce5..c1509a3 100644
--- a/ci/libvirt-opensuse-151.Dockerfile
+++ b/ci/libvirt-opensuse-151.Dockerfile
@@ -2,49 +2,51 @@ FROM opensuse/leap:15.1
 
 RUN zypper update -y && \
     zypper install -y \
-        autoconf \
-        automake \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        chrony \
-        cppi \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glibc-devel \
-        glibc-locale \
-        libtool \
-        libvirt-devel \
-        lsof \
-        make \
-        net-tools \
-        ninja \
-        patch \
-        perl \
-        pkgconfig \
-        python3 \
-        python3-devel \
-        python3-lxml \
-        python3-nose \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        rpm-build \
-        screen \
-        strace \
-        sudo \
-        vim && \
+           autoconf \
+           automake \
+           bash \
+           bash-completion \
+           ca-certificates \
+           ccache \
+           chrony \
+           cppi \
+           gcc \
+           gdb \
+           gettext \
+           gettext-devel \
+           git \
+           glibc-devel \
+           glibc-locale \
+           libtool \
+           libvirt-devel \
+           lsof \
+           make \
+           net-tools \
+           ninja \
+           patch \
+           perl \
+           perl-App-cpanminus \
+           pkgconfig \
+           python3 \
+           python3-devel \
+           python3-lxml \
+           python3-nose \
+           python3-pip \
+           python3-setuptools \
+           python3-wheel \
+           rpm-build \
+           screen \
+           strace \
+           sudo \
+           vim \
+           xz && \
     zypper clean --all && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
 
diff --git a/ci/libvirt-ubuntu-1804.Dockerfile b/ci/libvirt-ubuntu-1804.Dockerfile
index 7186fac..4e3e5b5 100644
--- a/ci/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/libvirt-ubuntu-1804.Dockerfile
@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             gcc \
             gdb \
             gettext \
@@ -38,7 +39,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             screen \
             strace \
             sudo \
-            vim && \
+            vim \
+            xz-utils && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -48,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
-         meson==0.49.0
+         meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
 
diff --git a/ci/libvirt-ubuntu-2004.Dockerfile b/ci/libvirt-ubuntu-2004.Dockerfile
index de959f5..eb63edc 100644
--- a/ci/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/libvirt-ubuntu-2004.Dockerfile
@@ -12,6 +12,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             gcc \
             gdb \
             gettext \
@@ -23,7 +24,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             locales \
             lsof \
             make \
-            meson \
             net-tools \
             ninja-build \
             patch \
@@ -33,12 +33,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-dev \
             python3-lxml \
             python3-nose \
+            python3-pip \
             python3-setuptools \
             python3-wheel \
             screen \
             strace \
             sudo \
-            vim && \
+            vim \
+            xz-utils && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -47,6 +49,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
+RUN pip3 install \
+         meson==0.54.0
+
 ENV LANG "en_US.UTF-8"
 
 ENV MAKE "/usr/bin/make"
diff --git a/ci/refresh b/ci/refresh
index 011afdc..0f21a53 100755
--- a/ci/refresh
+++ b/ci/refresh
@@ -14,7 +14,7 @@ then
     exit 1
 fi
 
-HOSTS=$($LCITOOL hosts | grep -v freebsd)
+HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|macos)')
 
 for host in $HOSTS
 do