[Libguestfs] [libnbd PATCH 13/20] ci: Update build files

The upstream patch for libvirt-ci is still not completed yet, but there are some improvements that need to be pulled in to clean up some of the builds. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- ci/cirrus/freebsd-12.vars | 5 ++--- ci/cirrus/freebsd-current.vars | 5 ++--- ci/cirrus/macos-11.vars | 6 +++--- ci/containers/centos-8.Dockerfile | 12 ++++++++---- ci/containers/centos-stream-8.Dockerfile | 12 ++++++++---- ci/containers/debian-10.Dockerfile | 9 ++++++--- ci/containers/debian-sid.Dockerfile | 9 ++++++--- ci/containers/fedora-33.Dockerfile | 14 +++++++++----- ci/containers/fedora-34.Dockerfile | 14 +++++++++----- ci/containers/fedora-rawhide.Dockerfile | 14 +++++++++----- ci/containers/opensuse-leap-152.Dockerfile | 12 ++++++++---- ci/containers/opensuse-tumbleweed.Dockerfile | 12 ++++++++---- ci/containers/ubuntu-1804.Dockerfile | 8 +++++--- ci/containers/ubuntu-2004.Dockerfile | 9 ++++++--- 14 files changed, 89 insertions(+), 52 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 4e7f653a859c..66619a081735 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,13 +2,12 @@ # # $ lcitool variables freebsd-12 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' 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='autoconf automake bash-completion ca_root_nss ccache coreutils diffutils fusefs-libs git glib gmake gnutls go gsed libev libtool libxml2 nbdkit ocaml ocaml-findlib perl5 pkgconf python3 qemu' +PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py37-flake8 python3 qemu' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index dfdf58e8616b..bca65bb0a114 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,13 +2,12 @@ # # $ lcitool variables freebsd-current libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' 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='autoconf automake bash-completion ca_root_nss ccache coreutils diffutils fusefs-libs git glib gmake gnutls go gsed libev libtool libxml2 nbdkit ocaml ocaml-findlib perl5 pkgconf python3 qemu' +PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py37-flake8 python3 qemu' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 413a203782eb..90ca6ed28877 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,13 +2,13 @@ # # $ lcitool variables macos-11 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ea3fb1a9a5976a2c70b85e4621... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... PACKAGING_COMMAND='brew' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' PIP3='/usr/local/bin/pip3' -PKGS='autoconf automake bash-completion ccache coreutils diffutils git glib gnu-sed gnutls golang libev libtool libxml2 make ocaml ocaml-findlib perl pkg-config python3 qemu' +PKGS='autoconf automake bash-completion ccache cpanminus diffutils flake8 fuse3 git glib gnu-sed gnutls golang jq libev libtool libxml2 make nbd ocaml ocaml-findlib ocamldoc perl pkg-config python3 qemu' +CPAN_PKGS='Pod::Simple' diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index e5bcd4ee7a9f..fe82a2878570 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM docker.io/library/centos:8 @@ -18,8 +18,8 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ - coreutils-single \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -27,8 +27,8 @@ RUN dnf update -y && \ glib2-devel \ glibc-devel \ glibc-langpack-en \ - gnutls \ gnutls-devel \ + gnutls-utils \ golang \ iproute \ jq \ @@ -39,13 +39,17 @@ RUN dnf update -y && \ nbdkit \ ocaml \ ocaml-findlib \ + ocamldoc \ perl \ + perl-Pod-Simple \ + perl-podlators \ pkgconfig \ python3-devel \ python3-flake8 \ qemu-img \ qemu-kvm \ - sed && \ + sed \ + util-linux && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index e7c18bf3d23f..d00bd32e4f99 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM quay.io/centos/centos:stream8 @@ -18,8 +18,8 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ - coreutils-single \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -27,8 +27,8 @@ RUN dnf update -y && \ glib2-devel \ glibc-devel \ glibc-langpack-en \ - gnutls \ gnutls-devel \ + gnutls-utils \ golang \ iproute \ jq \ @@ -39,13 +39,17 @@ RUN dnf update -y && \ nbdkit \ ocaml \ ocaml-findlib \ + ocamldoc \ perl \ + perl-Pod-Simple \ + perl-podlators \ pkgconfig \ python3-devel \ python3-flake8 \ qemu-img \ qemu-kvm \ - sed && \ + sed \ + util-linux && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 1d0d5eefa22d..8d9eeb41f714 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM docker.io/library/debian:10-slim @@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ bash-completion \ + bsdmainutils \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ flake8 \ + fuse3 \ g++ \ gcc \ git \ @@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nbdkit \ ocaml \ ocaml-findlib \ + ocaml-nox \ + perl \ perl-base \ pkgconf \ python3-dev \ - qemu-kvm \ + qemu \ qemu-utils \ sed && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 9e42d34dc56f..f470180e8e6f 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM docker.io/library/debian:sid-slim @@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ bash-completion \ + bsdextrautils \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ flake8 \ + fuse3 \ g++ \ gcc \ git \ @@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nbdkit \ ocaml \ ocaml-findlib \ + ocaml-nox \ + perl \ perl-base \ pkgconf \ python3-dev \ - qemu-kvm \ + qemu \ qemu-utils \ sed && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index a3b54c247a22..667819f641d4 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM registry.fedoraproject.org/fedora:33 @@ -24,8 +24,8 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -33,8 +33,8 @@ exec "$@"' > /usr/bin/nosync && \ glib2-devel \ glibc-devel \ glibc-langpack-en \ - gnutls \ gnutls-devel \ + gnutls-utils \ golang \ iproute \ jq \ @@ -46,13 +46,17 @@ exec "$@"' > /usr/bin/nosync && \ nbdkit \ ocaml \ ocaml-findlib \ + ocamldoc \ + perl-Pod-Simple \ perl-base \ + perl-podlators \ pkgconfig \ python3-devel \ python3-flake8 \ + qemu \ qemu-img \ - qemu-kvm \ - sed && \ + sed \ + util-linux && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 85f68f107b66..a44bb8b3a3e5 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-34 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM registry.fedoraproject.org/fedora:34 @@ -24,8 +24,8 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -33,8 +33,8 @@ exec "$@"' > /usr/bin/nosync && \ glib2-devel \ glibc-devel \ glibc-langpack-en \ - gnutls \ gnutls-devel \ + gnutls-utils \ golang \ iproute \ jq \ @@ -46,13 +46,17 @@ exec "$@"' > /usr/bin/nosync && \ nbdkit \ ocaml \ ocaml-findlib \ + ocamldoc \ + perl-Pod-Simple \ perl-base \ + perl-podlators \ pkgconfig \ python3-devel \ python3-flake8 \ + qemu \ qemu-img \ - qemu-kvm \ - sed && \ + sed \ + util-linux && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index e50b4837b6ea..17f5345a4e6e 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM registry.fedoraproject.org/fedora:rawhide @@ -25,8 +25,8 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -34,8 +34,8 @@ exec "$@"' > /usr/bin/nosync && \ glib2-devel \ glibc-devel \ glibc-langpack-en \ - gnutls \ gnutls-devel \ + gnutls-utils \ golang \ iproute \ jq \ @@ -47,13 +47,17 @@ exec "$@"' > /usr/bin/nosync && \ nbdkit \ ocaml \ ocaml-findlib \ + ocamldoc \ + perl-Pod-Simple \ perl-base \ + perl-podlators \ pkgconfig \ python3-devel \ python3-flake8 \ + qemu \ qemu-img \ - qemu-kvm \ - sed && \ + sed \ + util-linux && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index cfc664a686ca..0e6fc8c44f47 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-leap-152 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM registry.opensuse.org/opensuse/leap:15.2 @@ -14,8 +14,8 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -35,13 +35,17 @@ RUN zypper update -y && \ nbd \ ocaml \ ocaml-findlib \ + ocaml-ocamldoc \ + perl \ + perl-Pod-Simple \ perl-base \ pkgconfig \ python3-devel \ python3-flake8 \ - qemu-kvm \ + qemu \ qemu-tools \ - sed && \ + sed \ + util-linux && \ zypper clean --all && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 0a399aae7ea3..26df75bb2ff1 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-tumbleweed libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM registry.opensuse.org/opensuse/tumbleweed:latest @@ -14,8 +14,8 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ + fuse3 \ fuse3-devel \ gcc \ gcc-c++ \ @@ -36,13 +36,17 @@ RUN zypper update -y && \ nbdkit \ ocaml \ ocaml-findlib \ + ocaml-ocamldoc \ + perl \ + perl-Pod-Simple \ perl-base \ pkgconfig \ python3-devel \ python3-flake8 \ - qemu-kvm \ + qemu \ qemu-tools \ - sed && \ + sed \ + util-linux && \ zypper clean --all && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 2a4ad5a34715..0426b4392038 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM docker.io/library/ubuntu:18.04 @@ -14,10 +14,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ bash-completion \ + bsdmainutils \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ flake8 \ g++ \ @@ -39,10 +39,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nbd-server \ ocaml \ ocaml-findlib \ + ocaml-nox \ + perl \ perl-base \ pkgconf \ python3-dev \ - qemu-kvm \ + qemu \ qemu-utils \ sed && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index ea1cf9bd7e8a..f23b42ae9241 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd0... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/cf6a6438c15ff690d720ee6679... FROM docker.io/library/ubuntu:20.04 @@ -14,12 +14,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ autoconf \ automake \ bash-completion \ + bsdmainutils \ ca-certificates \ ccache \ clang \ - coreutils \ diffutils \ flake8 \ + fuse3 \ g++ \ gcc \ git \ @@ -41,10 +42,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nbdkit \ ocaml \ ocaml-findlib \ + ocaml-nox \ + perl \ perl-base \ pkgconf \ python3-dev \ - qemu-kvm \ + qemu \ qemu-utils \ sed && \ eatmydata apt-get autoremove -y && \ -- 2.31.1