[Qemu-devel] [PATCH 0/4] docker: improve code coverage on CentOS images

[Qemu-devel] [PATCH 0/4] docker: improve code coverage on CentOS images

[Philippe Mathieu-Daudé]

This series installs more packages to docker images to extend CI code
coverage.

Debian already have those but these images are only used on Shippable.
Extending CentOS images could improve patchew, and local user not custom to
Debian.

The first idea was to add Suse images but only OpenSUSE 13.2 is available on
DockerHub and the problem reported on [1] is using SUSE SLE11.

Regards,

Phil.

[1] http://lists.nongnu.org/archive/html/qemu-devel/2017-07/msg08993.html

Philippe Mathieu-Daudé (4):
  docker: use one package per line in CentOS config
  docker: add Xen libs to centos6 image
  docker: install more packages on CentOS to extend code coverage
  docker: add centos7 image

 tests/docker/dockerfiles/centos6.docker | 31 ++++++++++++++++++++++++++-----
 tests/docker/dockerfiles/centos7.docker | 31 +++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 tests/docker/dockerfiles/centos7.docker

-- 
2.13.3

[Qemu-devel] [PATCH 1/4] docker: use one package per line in CentOS config

[Philippe Mathieu-Daudé]

This ease rebase/cherry-pick, also it is faster to visually find if a package
is here.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/centos6.docker | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 17a4d24d54..9b91e832c2 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -1,8 +1,18 @@
 FROM centos:6
 RUN yum install -y epel-release
-ENV PACKAGES libfdt-devel ccache \
-    tar git make gcc g++ flex bison \
-    zlib-devel glib2-devel SDL-devel pixman-devel \
-    epel-release
+ENV PACKAGES \
+    bison \
+    ccache \
+    flex \
+    g++ \
+    gcc \
+    git \
+    glib2-devel \
+    libfdt-devel \
+    make \
+    pixman-devel \
+    SDL-devel \
+    tar \
+    zlib-devel
 RUN yum install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.13.3

[Qemu-devel] [PATCH 2/4] docker: add Xen libs to centos6 image

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/centos6.docker | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 9b91e832c2..8588a12eab 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -1,5 +1,5 @@
 FROM centos:6
-RUN yum install -y epel-release
+RUN yum install -y epel-release centos-release-xen
 ENV PACKAGES \
     bison \
     ccache \
@@ -13,6 +13,7 @@ ENV PACKAGES \
     pixman-devel \
     SDL-devel \
     tar \
+    xen-devel \
     zlib-devel
 RUN yum install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.13.3

[Qemu-devel] [PATCH 3/4] docker: install more packages on CentOS to extend code coverage

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/centos6.docker | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 8588a12eab..f6aae13f29 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -2,17 +2,27 @@ FROM centos:6
 RUN yum install -y epel-release centos-release-xen
 ENV PACKAGES \
     bison \
+    bzip2-devel \
     ccache \
+    csnappy-devel \
     flex \
     g++ \
     gcc \
     git \
     glib2-devel \
+    libepoxy-devel \
     libfdt-devel \
+    librdmacm-devel \
+    lzo-devel \
     make \
+    mesa-libEGL-devel \
+    mesa-libgbm-devel \
     pixman-devel \
     SDL-devel \
+    spice-glib-devel \
+    spice-server-devel \
     tar \
+    vte-devel \
     xen-devel \
     zlib-devel
 RUN yum install -y $PACKAGES
-- 
2.13.3

[Qemu-devel] [PATCH 4/4] docker: add centos7 image

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/centos7.docker | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/docker/dockerfiles/centos7.docker

diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
new file mode 100644
index 0000000000..0b59aa2f26
--- /dev/null
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -0,0 +1,31 @@
+FROM centos:7
+RUN yum install -y epel-release centos-release-xen
+RUN yum -y update
+ENV PACKAGES \
+    bison \
+    bzip2-devel \
+    ccache \
+    csnappy-devel \
+    flex \
+    g++ \
+    gcc \
+    git \
+    glib2-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    librdmacm-devel \
+    lzo-devel \
+    make \
+    mesa-libEGL-devel \
+    mesa-libgbm-devel \
+    pixman-devel \
+    SDL-devel \
+    spice-glib-devel \
+    spice-server-devel \
+    tar \
+    vte-devel \
+    xen-devel \
+    zlib-devel
+RUN yum install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
+
-- 
2.13.3

Re: [Qemu-devel] [PATCH 0/4] docker: improve code coverage on CentOS images

[Fam Zheng]

On Fri, 07/28 20:33, Philippe Mathieu-Daudé wrote:
> This series installs more packages to docker images to extend CI code
> coverage.
> 
> Debian already have those but these images are only used on Shippable.
> Extending CentOS images could improve patchew, and local user not custom to
> Debian.

Thanks, queued.

> 
> The first idea was to add Suse images but only OpenSUSE 13.2 is available on
> DockerHub and the problem reported on [1] is using SUSE SLE11.

Have you checked if it is covered by the min-glib image?

Fam

Re: [Qemu-devel] [PATCH 4/4] docker: add centos7 image

[Fam Zheng]

On Fri, 07/28 20:33, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/dockerfiles/centos7.docker | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/centos7.docker
> 
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> new file mode 100644
> index 0000000000..0b59aa2f26
> --- /dev/null
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -0,0 +1,31 @@
> +FROM centos:7
> +RUN yum install -y epel-release centos-release-xen
> +RUN yum -y update
> +ENV PACKAGES \
> +    bison \
> +    bzip2-devel \
> +    ccache \
> +    csnappy-devel \
> +    flex \
> +    g++ \
> +    gcc \
> +    git \
> +    glib2-devel \
> +    libepoxy-devel \
> +    libfdt-devel \
> +    librdmacm-devel \
> +    lzo-devel \
> +    make \
> +    mesa-libEGL-devel \
> +    mesa-libgbm-devel \
> +    pixman-devel \
> +    SDL-devel \
> +    spice-glib-devel \
> +    spice-server-devel \
> +    tar \
> +    vte-devel \
> +    xen-devel \
> +    zlib-devel
> +RUN yum install -y $PACKAGES
> +RUN rpm -q $PACKAGES | sort > /packages.txt
> +
> -- 
> 2.13.3
> 

Not a fault of this patch but I found that "test-quick" fails at vhost-user-test
due to -EACCESS in qemu_memfd_alloc():ftruncate(). Adding --privileged to the
docker run command line fixes it.

Fam