diff mbox series

[v1,20/34] tests/docker: add libfuse3 development headers

Message ID 20220105135009.1584676-21-alex.bennee@linaro.org
State Superseded
Headers show
Series testing/next and other misc fixes | expand

Commit Message

Alex Bennée Jan. 5, 2022, 1:49 p.m. UTC
From: Stefan Hajnoczi <stefanha@redhat.com>

The FUSE exports feature is not built because most container images do
not have libfuse3 development headers installed. Add the necessary
packages to the Dockerfiles.

Cc: Hanna Reitz <hreitz@redhat.com>
Cc: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Tested-by: Beraldo Leal <bleal@redhat.com>
Message-Id: <20211207160025.52466-1-stefanha@redhat.com>
[AJB: migrate to lcitool qemu.yml and regenerate]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/alpine.docker        | 1 +
 tests/docker/dockerfiles/centos8.docker       | 1 +
 tests/docker/dockerfiles/fedora.docker        | 1 +
 tests/docker/dockerfiles/opensuse-leap.docker | 1 +
 tests/docker/dockerfiles/ubuntu2004.docker    | 1 +
 tests/lcitool/projects/qemu.yml               | 1 +
 6 files changed, 6 insertions(+)

Comments

Richard W.M. Jones Jan. 5, 2022, 2:26 p.m. UTC | #1
On Wed, Jan 05, 2022 at 01:49:55PM +0000, Alex Bennée wrote:
> From: Stefan Hajnoczi <stefanha@redhat.com>
> 
> The FUSE exports feature is not built because most container images do
> not have libfuse3 development headers installed. Add the necessary
> packages to the Dockerfiles.
> 
> Cc: Hanna Reitz <hreitz@redhat.com>
> Cc: Richard W.M. Jones <rjones@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> Acked-by: Richard W.M. Jones <rjones@redhat.com>
> Reviewed-by: Beraldo Leal <bleal@redhat.com>
> Tested-by: Beraldo Leal <bleal@redhat.com>
> Message-Id: <20211207160025.52466-1-stefanha@redhat.com>
> [AJB: migrate to lcitool qemu.yml and regenerate]
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


I checked all the package names and they look good, so:

Reviewed-by: Richard W.M. Jones <rjones@redhat.com>

Rich.

>  tests/docker/dockerfiles/alpine.docker        | 1 +
>  tests/docker/dockerfiles/centos8.docker       | 1 +
>  tests/docker/dockerfiles/fedora.docker        | 1 +
>  tests/docker/dockerfiles/opensuse-leap.docker | 1 +
>  tests/docker/dockerfiles/ubuntu2004.docker    | 1 +
>  tests/lcitool/projects/qemu.yml               | 1 +
>  6 files changed, 6 insertions(+)
> 
> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
> index 97c7a88d1f..eb2251c81c 100644
> --- a/tests/docker/dockerfiles/alpine.docker
> +++ b/tests/docker/dockerfiles/alpine.docker
> @@ -29,6 +29,7 @@ RUN apk update && \
>          dtc-dev \
>          eudev-dev \
>          findutils \
> +        fuse3-dev \
>          g++ \
>          gcc \
>          gcovr \
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 3c62b62a99..cbb909d02b 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -30,6 +30,7 @@ RUN dnf update -y && \
>          device-mapper-multipath-devel \
>          diffutils \
>          findutils \
> +        fuse3-devel \
>          gcc \
>          gcc-c++ \
>          genisoimage \
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 6784878b56..60207f3da3 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -37,6 +37,7 @@ exec "$@"' > /usr/bin/nosync && \
>          device-mapper-multipath-devel \
>          diffutils \
>          findutils \
> +        fuse3-devel \
>          gcc \
>          gcc-c++ \
>          gcovr \
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index 5510bdf19c..f57d8cfb29 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -22,6 +22,7 @@ RUN zypper update -y && \
>             dbus-1 \
>             diffutils \
>             findutils \
> +           fuse3-devel \
>             gcc \
>             gcc-c++ \
>             gcovr \
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
> index 40402b91fe..4e562dfdcd 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -46,6 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>              libepoxy-dev \
>              libfdt-dev \
>              libffi-dev \
> +            libfuse3-dev \
>              libgbm-dev \
>              libgcrypt20-dev \
>              libglib2.0-dev \
> diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
> index 2e2271510e..ed5ab1407a 100644
> --- a/tests/lcitool/projects/qemu.yml
> +++ b/tests/lcitool/projects/qemu.yml
> @@ -18,6 +18,7 @@ packages:
>   - diffutils
>   - dtrace
>   - findutils
> + - fuse3
>   - g++
>   - gcc
>   - gcovr
> -- 
> 2.30.2
Daniel P. Berrangé Jan. 5, 2022, 2:50 p.m. UTC | #2
On Wed, Jan 05, 2022 at 02:26:55PM +0000, Richard W.M. Jones wrote:
> On Wed, Jan 05, 2022 at 01:49:55PM +0000, Alex Bennée wrote:
> > From: Stefan Hajnoczi <stefanha@redhat.com>
> > 
> > The FUSE exports feature is not built because most container images do
> > not have libfuse3 development headers installed. Add the necessary
> > packages to the Dockerfiles.
> > 
> > Cc: Hanna Reitz <hreitz@redhat.com>
> > Cc: Richard W.M. Jones <rjones@redhat.com>
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Acked-by: Richard W.M. Jones <rjones@redhat.com>
> > Reviewed-by: Beraldo Leal <bleal@redhat.com>
> > Tested-by: Beraldo Leal <bleal@redhat.com>
> > Message-Id: <20211207160025.52466-1-stefanha@redhat.com>
> > [AJB: migrate to lcitool qemu.yml and regenerate]
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> 
> I checked all the package names and they look good, so:

FYI, the libvirt-ci  CI pipelines validate that all package
names are correct by creating a job for each distro and
checking that every package known to libvirt-ci can be
installed. This catches issues where distros rename or
drop packages. These are some of the reasons why we'll
benefit from using libvirt-ci / lcitool for auto-generating
these dockerfiles in QEMU.

Regards,
Daniel
diff mbox series

Patch

diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 97c7a88d1f..eb2251c81c 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -29,6 +29,7 @@  RUN apk update && \
         dtc-dev \
         eudev-dev \
         findutils \
+        fuse3-dev \
         g++ \
         gcc \
         gcovr \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 3c62b62a99..cbb909d02b 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -30,6 +30,7 @@  RUN dnf update -y && \
         device-mapper-multipath-devel \
         diffutils \
         findutils \
+        fuse3-devel \
         gcc \
         gcc-c++ \
         genisoimage \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 6784878b56..60207f3da3 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -37,6 +37,7 @@  exec "$@"' > /usr/bin/nosync && \
         device-mapper-multipath-devel \
         diffutils \
         findutils \
+        fuse3-devel \
         gcc \
         gcc-c++ \
         gcovr \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 5510bdf19c..f57d8cfb29 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -22,6 +22,7 @@  RUN zypper update -y && \
            dbus-1 \
            diffutils \
            findutils \
+           fuse3-devel \
            gcc \
            gcc-c++ \
            gcovr \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 40402b91fe..4e562dfdcd 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -46,6 +46,7 @@  RUN export DEBIAN_FRONTEND=noninteractive && \
             libepoxy-dev \
             libfdt-dev \
             libffi-dev \
+            libfuse3-dev \
             libgbm-dev \
             libgcrypt20-dev \
             libglib2.0-dev \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 2e2271510e..ed5ab1407a 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -18,6 +18,7 @@  packages:
  - diffutils
  - dtrace
  - findutils
+ - fuse3
  - g++
  - gcc
  - gcovr