diff mbox series

[v2,08/25] tests/docker: fix mistakes in centos package lists

Message ID 20210114130245.1654081-9-berrange@redhat.com
State New
Headers show
Series tests/docker: start using libvirt-ci's "lcitool" for dockerfiles | expand

Commit Message

Daniel P. Berrangé Jan. 14, 2021, 1:02 p.m. UTC 
dbus-daemon doesn't exist in centos7, it is part of dbus.

snappy is used by QEMU, not csnappy.

mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is.

vte291-devel is required for GTK3, not vte-devel.

spice-glib-devel is not use in QEMU at all, but spice-protocol is.

librdmacm-devel is a virtual provides for compat, the actual package
used is rdma-core-devel.

There is no need to specifically refer to python36, we can just
use python3 as in other distros.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/docker/dockerfiles/centos7.docker | 11 +++++------
 tests/docker/dockerfiles/centos8.docker | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

Comments

Wainer dos Santos Moschetta Jan. 15, 2021, 6:39 p.m. UTC | #1 
On 1/14/21 10:02 AM, Daniel P. Berrangé wrote:
> dbus-daemon doesn't exist in centos7, it is part of dbus.
>
> snappy is used by QEMU, not csnappy.
>
> mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is.
>
> vte291-devel is required for GTK3, not vte-devel.
>
> spice-glib-devel is not use in QEMU at all, but spice-protocol is.
>
> librdmacm-devel is a virtual provides for compat, the actual package
> used is rdma-core-devel.
>
> There is no need to specifically refer to python36, we can just
> use python3 as in other distros.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/docker/dockerfiles/centos7.docker | 11 +++++------
>   tests/docker/dockerfiles/centos8.docker | 10 +++++-----
>   2 files changed, 10 insertions(+), 11 deletions(-)


Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> index b2a4719284..1eb3455144 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -9,8 +9,7 @@ ENV PACKAGES \
>       bzip2 \
>       bzip2-devel \
>       ccache \
> -    csnappy-devel \
> -    dbus-daemon \
> +    dbus \
>       gcc \
>       gcc-c++ \
>       gettext \
> @@ -22,21 +21,21 @@ ENV PACKAGES \
>       libepoxy-devel \
>       libfdt-devel \
>       libgcrypt-devel \
> -    librdmacm-devel \
>       libzstd-devel \
>       lzo-devel \
>       make \
> -    mesa-libEGL-devel \
>       mesa-libgbm-devel \
>       nettle-devel \
>       ninja-build \
>       perl-Test-Harness \
>       pixman-devel \
>       python3 \
> -    spice-glib-devel \
> +    rdma-core-devel \
> +    snappy-devel \
> +    spice-protocol \
>       spice-server-devel \
>       tar \
> -    vte-devel \
> +    vte291-devel \
>       xen-devel \
>       zlib-devel
>   RUN yum install -y $PACKAGES
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index a95350466a..b64ee7071d 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -19,16 +19,16 @@ ENV PACKAGES \
>       libgcrypt-devel \
>       lzo-devel \
>       make \
> -    mesa-libEGL-devel \
> -    nmap-ncat \
> +    mesa-libgbm-devel \
>       nettle-devel \
>       ninja-build \
> +    nmap-ncat \
>       perl-Test-Harness \
>       pixman-devel \
> -    python36 \
> +    python3 \
>       rdma-core-devel \
> -    spice-glib-devel \
> -    spice-server \
> +    spice-protocol \
> +    spice-server-devel \
>       tar \
>       zlib-devel
>
diff mbox series

Patch

diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index b2a4719284..1eb3455144 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -9,8 +9,7 @@  ENV PACKAGES \
     bzip2 \
     bzip2-devel \
     ccache \
-    csnappy-devel \
-    dbus-daemon \
+    dbus \
     gcc \
     gcc-c++ \
     gettext \
@@ -22,21 +21,21 @@  ENV PACKAGES \
     libepoxy-devel \
     libfdt-devel \
     libgcrypt-devel \
-    librdmacm-devel \
     libzstd-devel \
     lzo-devel \
     make \
-    mesa-libEGL-devel \
     mesa-libgbm-devel \
     nettle-devel \
     ninja-build \
     perl-Test-Harness \
     pixman-devel \
     python3 \
-    spice-glib-devel \
+    rdma-core-devel \
+    snappy-devel \
+    spice-protocol \
     spice-server-devel \
     tar \
-    vte-devel \
+    vte291-devel \
     xen-devel \
     zlib-devel
 RUN yum install -y $PACKAGES
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index a95350466a..b64ee7071d 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -19,16 +19,16 @@  ENV PACKAGES \
     libgcrypt-devel \
     lzo-devel \
     make \
-    mesa-libEGL-devel \
-    nmap-ncat \
+    mesa-libgbm-devel \
     nettle-devel \
     ninja-build \
+    nmap-ncat \
     perl-Test-Harness \
     pixman-devel \
-    python36 \
+    python3 \
     rdma-core-devel \
-    spice-glib-devel \
-    spice-server \
+    spice-protocol \
+    spice-server-devel \
     tar \
     zlib-devel