gitlab: refresh containers / cirrus files with latest content

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

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 914ad417b9af3e16076912e3345696dd5b8707e6..36bcc522dcc8f9cb081bec6292eda0593a0987d4 100644 (file)
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -2,12 +2,12 @@
 #
 #  $ lcitool variables freebsd-12 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068
+# https://gitlab.com/libvirt/libvirt-ci
 
 PACKAGING_COMMAND='pkg'
 CCACHE='/usr/local/bin/ccache'
 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 gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl'
+PIP3='/usr/local/bin/pip-3.8'
+PKGS='augeas 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 py38-docutils py38-flake8 python3 qemu radvd readline yajl'

diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index 58c18a2f36a2c5311f4725bc9e641c8fb93f693d..8a86f55237cb4e6cd519511000980c9c1b39970c 100644 (file)
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -2,12 +2,12 @@
 #
 #  $ lcitool variables freebsd-13 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068
+# https://gitlab.com/libvirt/libvirt-ci
 
 PACKAGING_COMMAND='pkg'
 CCACHE='/usr/local/bin/ccache'
 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 gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl'
+PIP3='/usr/local/bin/pip-3.8'
+PKGS='augeas 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 py38-docutils py38-flake8 python3 qemu radvd readline yajl'

diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 1a5ac52cf946b9814a870a13a2c51da7c1251caa..d3089863843ea3c3d2aecb6d472c967de1a360ae 100644 (file)
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -2,12 +2,12 @@
 #
 #  $ lcitool variables freebsd-current libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068
+# https://gitlab.com/libvirt/libvirt-ci
 
 PACKAGING_COMMAND='pkg'
 CCACHE='/usr/local/bin/ccache'
 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 gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl'
+PIP3='/usr/local/bin/pip-3.8'
+PKGS='augeas 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 py38-docutils py38-flake8 python3 qemu radvd readline yajl'

diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index 73402bab8fcdc098684b502ed5921bf970c8b8ed..1da29e9ed6b672c7a9e181bdefb35574e3577db7 100644 (file)
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -2,7 +2,7 @@
 #
 #  $ lcitool variables macos-11 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068
+# https://gitlab.com/libvirt/libvirt-ci
 
 PACKAGING_COMMAND='brew'
 CCACHE='/usr/local/bin/ccache'

diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
index 9358e69b0c268b028ef5625674436cc4e880c69b..2667e5f4f8d5726b08ee9ec0bcd3648856f9ad4e 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/centos:8
 
@@ -14,7 +14,6 @@ RUN dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        avahi-devel \
         bash-completion \
         ca-certificates \
         ccache \

diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 3355374e67b66c9a5e54620832a938b1b81d46f2..f89f7648fee85060945d31ab0ab8b2472e438f76 100644 (file)
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile centos-stream-8 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM quay.io/centos/centos:stream8
 
@@ -14,7 +14,6 @@ RUN dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        avahi-devel \
         bash-completion \
         ca-certificates \
         ccache \

diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
index 7d10b93d06ea60806639d3b40fd64c2c8b734284..b81a3f123e79fe3520fdcca8402e91058f82b811 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:arm64 \
             libattr1-dev:arm64 \
             libaudit-dev:arm64 \
-            libavahi-client-dev:arm64 \
             libblkid-dev:arm64 \
             libc6-dev:arm64 \
             libcap-ng-dev:arm64 \

diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
index 25057ea993355f9ee9c104b2790087d8f7aaf169..dcfb73d83a0b2388fe43870d5736090cd7a5d5a9 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:armel \
             libattr1-dev:armel \
             libaudit-dev:armel \
-            libavahi-client-dev:armel \
             libblkid-dev:armel \
             libc6-dev:armel \
             libcap-ng-dev:armel \

diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
index ef880ac0fed37963fceb544801c1e8951ffe0983..f125fc17899e5cf496f7de82254a16f0b00038b9 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:armhf \
             libattr1-dev:armhf \
             libaudit-dev:armhf \
-            libavahi-client-dev:armhf \
             libblkid-dev:armhf \
             libc6-dev:armhf \
             libcap-ng-dev:armhf \

diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
index 5826866c2d0dfb52c767f9bfaa2874e765d7dc9d..fe9f9e3a6def7951722b940824baf671b35e0432 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:i386 \
             libattr1-dev:i386 \
             libaudit-dev:i386 \
-            libavahi-client-dev:i386 \
             libblkid-dev:i386 \
             libc6-dev:i386 \
             libcap-ng-dev:i386 \

diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
index aaa2df47a861f8e63e82bd49c13315a1ceae0c27..c1b441de4071e793e25b9ebcdf4c59e6f4fd4e37 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:mips \
             libattr1-dev:mips \
             libaudit-dev:mips \
-            libavahi-client-dev:mips \
             libblkid-dev:mips \
             libc6-dev:mips \
             libcap-ng-dev:mips \

diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
index d3f25791a39753dea6b27952ea4b1bdb767e40ab..bdce6891485d1114dac748a94008e5b1cd5bd6b3 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:mips64el \
             libattr1-dev:mips64el \
             libaudit-dev:mips64el \
-            libavahi-client-dev:mips64el \
             libblkid-dev:mips64el \
             libc6-dev:mips64el \
             libcap-ng-dev:mips64el \

diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
index cc9142aa72e20fdfd7e4e7ada86b92bd712ea735..0bfa1e05520af151ed641cc476083473eb216d19 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:mipsel \
             libattr1-dev:mipsel \
             libaudit-dev:mipsel \
-            libavahi-client-dev:mipsel \
             libblkid-dev:mipsel \
             libc6-dev:mipsel \
             libcap-ng-dev:mipsel \

diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index ce68bbb19f9696f928d529d6e864fd47bccbe072..08cc080f8ab8e4d115281ad4bb9ae4adff2be314 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:ppc64el \
             libattr1-dev:ppc64el \
             libaudit-dev:ppc64el \
-            libavahi-client-dev:ppc64el \
             libblkid-dev:ppc64el \
             libc6-dev:ppc64el \
             libcap-ng-dev:ppc64el \

diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
index 773f04933fb695ce907be8ed5e3e655408ef3899..62f0584129105d12de0c31ac4412e4d28e73d20a 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             radvd \
             scrub \
             sed \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:s390x \
             libattr1-dev:s390x \
             libaudit-dev:s390x \
-            libavahi-client-dev:s390x \
             libblkid-dev:s390x \
             libc6-dev:s390x \
             libcap-ng-dev:s390x \

diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 119a77bb0950ebc1d086c360b59bc5bdd8b384bd..211442c673d5d6141c7160fc091bb9c705b50318 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:10-slim
 
@@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev \
             libattr1-dev \
             libaudit-dev \
-            libavahi-client-dev \
             libblkid-dev \
             libc-dev-bin \
             libc6-dev \
@@ -90,8 +89,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             systemtap-sdt-dev \
             wireshark-dev \
             xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
+            xsltproc && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \

diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 736414b1791be6525216a447c57c2eb6d2e8cded..3dcba9038acee73c409809b7b62d18c9f1fa62cb 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:arm64 \
             libattr1-dev:arm64 \
             libaudit-dev:arm64 \
-            libavahi-client-dev:arm64 \
             libblkid-dev:arm64 \
             libc6-dev:arm64 \
             libcap-ng-dev:arm64 \

diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index b4304a7f32aef93cc0e46e320bdd138688fa3370..34255cd3b04d94e49a96619178f67a78d3112a49 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:armel \
             libattr1-dev:armel \
             libaudit-dev:armel \
-            libavahi-client-dev:armel \
             libblkid-dev:armel \
             libc6-dev:armel \
             libcap-ng-dev:armel \

diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index e4db402bc96a19c198789b761e9e91cdbe29c135..8ec54bdee13a7a1b76e972b83fe8edce059259fa 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:armhf \
             libattr1-dev:armhf \
             libaudit-dev:armhf \
-            libavahi-client-dev:armhf \
             libblkid-dev:armhf \
             libc6-dev:armhf \
             libcap-ng-dev:armhf \

diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index 983cd2a33644a668840b0a531c592b254a3dfa17..555e36d014fc92eaba322e9ffe6e2361f34d9aaf 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:i386 \
             libattr1-dev:i386 \
             libaudit-dev:i386 \
-            libavahi-client-dev:i386 \
             libblkid-dev:i386 \
             libc6-dev:i386 \
             libcap-ng-dev:i386 \

diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index e568b46d6074430ed72c0fdd85560ec2e47339bd..20478e1f02458bed235397039326915b7ce7c221 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:mips64el \
             libattr1-dev:mips64el \
             libaudit-dev:mips64el \
-            libavahi-client-dev:mips64el \
             libblkid-dev:mips64el \
             libc6-dev:mips64el \
             libcap-ng-dev:mips64el \

diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index cf24c09244f73ceaf940b26db83df7d8616e6372..abf0642bd62bc6b1a5d7367403a66eef677f2b84 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:mipsel \
             libattr1-dev:mipsel \
             libaudit-dev:mipsel \
-            libavahi-client-dev:mipsel \
             libblkid-dev:mipsel \
             libc6-dev:mipsel \
             libcap-ng-dev:mipsel \

diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 40be4130afdbe6a39d0821f6d90adb79629d3bad..a339905329eead34981f49795f17200bc05b1d90 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:ppc64el \
             libattr1-dev:ppc64el \
             libaudit-dev:ppc64el \
-            libavahi-client-dev:ppc64el \
             libblkid-dev:ppc64el \
             libc6-dev:ppc64el \
             libcap-ng-dev:ppc64el \

diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index e0b7dff94abad8228964cc2da2ac61ddc93ee696..c29bb57d88d735326abb3205264c0f9baeeff087 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev:s390x \
             libattr1-dev:s390x \
             libaudit-dev:s390x \
-            libavahi-client-dev:s390x \
             libblkid-dev:s390x \
             libc6-dev:s390x \
             libcap-ng-dev:s390x \

diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 454d726465eb09dfea838f200a7c721ddc6f9c63..cb6a24cb50e6a5815c263053527a1b1f8ae604bb 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/debian:sid-slim
 
@@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev \
             libattr1-dev \
             libaudit-dev \
-            libavahi-client-dev \
             libblkid-dev \
             libc-dev-bin \
             libc6-dev \

diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile
index aed94d1256b64e0c40838d42492f82dcf6b0ad11..7350de493f2ba852ff2e5a2b5fb45b50fdc0dae8 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.fedoraproject.org/fedora:33
 
@@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \
     nosync dnf install -y \
         audit-libs-devel \
         augeas \
-        avahi-devel \
         bash-completion \
         ca-certificates \
         ccache \

diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
index 53a5d67b3f2be83be9f870b597680bed0d293304..10a19a8f519e9be968017cc8d9670859ed69afb5 100644 (file)
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile fedora-34 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.fedoraproject.org/fedora:34
 
@@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \
     nosync dnf install -y \
         audit-libs-devel \
         augeas \
-        avahi-devel \
         bash-completion \
         ca-certificates \
         ccache \

diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 93a57b3277e6c4447809d77a030227179b72727a..48c4dd36426e493cfedded1ee8baa7d08c29300d 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.fedoraproject.org/fedora:rawhide
 

diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index ed16d75479c18cdf75248125bfbe48a6eae96558..38fb9a6aeb8993c70ddfbd5981b22d9c83677687 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.fedoraproject.org/fedora:rawhide
 

diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 79bacbcc9560f73dd2e8c33ec9fede30048f615d..b36fb9343eceaf6f2c180b791b659b786cefaeb3 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.fedoraproject.org/fedora:rawhide
 
@@ -21,7 +21,6 @@ exec "$@"' > /usr/bin/nosync && \
     nosync dnf install -y \
         audit-libs-devel \
         augeas \
-        avahi-devel \
         bash-completion \
         ca-certificates \
         ccache \

diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index b5f7e5f54ef71087af4dc6c656ed8d0b0a50c5e0..abe3e57185acd44f33a49b1429f7f5f992fccae1 100644 (file)
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile opensuse-leap-152 libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.opensuse.org/opensuse/leap:15.2
 
@@ -11,7 +11,6 @@ RUN zypper update -y && \
            audit-devel \
            augeas \
            augeas-lenses \
-           avahi-devel \
            bash-completion \
            ca-certificates \
            ccache \

diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 9f49fdabfddf438fcf655b79830c45296c9da03b..18b136fe035fb9f2e6242504243dcedb99649d1e 100644 (file)
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -2,7 +2,7 @@
 #
 #  $ lcitool dockerfile opensuse-tumbleweed libvirt
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 
@@ -11,7 +11,6 @@ RUN zypper update -y && \
            audit-devel \
            augeas \
            augeas-lenses \
-           avahi-devel \
            bash-completion \
            ca-certificates \
            ccache \

diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index 5e4a2e0b8fec4ee4f38f4278b092b95e6aa9044f..21b73e62aa727b50ad2a20283ff18031cd007acd 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/ubuntu:18.04
 
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev \
             libattr1-dev \
             libaudit-dev \
-            libavahi-client-dev \
             libblkid-dev \
             libc-dev-bin \
             libc6-dev \

diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 0e2790f03f9324582971bcdf3b0f5a2100261230..5654ad003f4726e4b9dc2732cb75a67536534087 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/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0
+# https://gitlab.com/libvirt/libvirt-ci
 
 FROM docker.io/library/ubuntu:20.04
 
@@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libapparmor-dev \
             libattr1-dev \
             libaudit-dev \
-            libavahi-client-dev \
             libblkid-dev \
             libc-dev-bin \
             libc6-dev \