tests/docker: Fixes for 5.0
cover tests/docker: Fixes for 5.0
Easy fixes for our Docker images.
Philippe Mathieu-Daudé (4):
tests/docker: Keep package list sorted
tests/docker: Install gcrypt devel package in Debian image tests/docker: Use Python3 PyYAML in the Fedora image tests/docker: Add libepoxy and libudev packages to the Fedora image
tests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/fedora.docker | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-)
Signature · 1 line
2.21.1
PATCH 1/4 tests/docker: Keep package list sorted
Keep package list sorted, this eases rebase/cherry-pick.
--- tests/docker/dockerfiles/centos7.docker | 6 ++++-- tests/docker/dockerfiles/fedora.docker | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
tests/docker/dockerfiles/centos7.docker +4 -2
@@ -2,6 +2,8 @@ FROM centos:7 RUN yum install -y epel-release centos-release-xen-48 RUN yum -y update + +# Please keep this list sorted alphabetically ENV PACKAGES \ bison \ bzip2 \
@@ -19,6 +21,7 @@ ENV PACKAGES \ libepoxy-devel \ libfdt-devel \ librdmacm-devel \ + libzstd-devel \ lzo-devel \ make \ mesa-libEGL-devel \
@@ -33,7 +36,6 @@ ENV PACKAGES \ tar \ vte-devel \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt
tests/docker/dockerfiles/fedora.docker +4 -2
@@ -1,4 +1,6 @@ FROM fedora:30 + +# Please keep this list sorted alphabetically ENV PACKAGES \ bc \ bison \
@@ -38,6 +40,7 @@ ENV PACKAGES \ libubsan \ libusbx-devel \ libxml2-devel \ + libzstd-devel \ llvm \ lzo-devel \ make \
@@ -92,8 +95,7 @@ ENV PACKAGES \ vte291-devel \ which \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES
Signature · 1 line
2.21.1
PATCH 2/4 tests/docker: Install gcrypt devel package in Debian image
In reply to Philippe Mathieu-DaudéApparently Debian Stretch was listing gcrypt as a QEMU dependency, but this is not the case anymore in Buster, so we need to install it manually (it it not listed by 'apt-get -s build-dep qemu' in the common debian10.docker anymore).
$ ../configure $QEMU_CONFIGURE_OPTS
ERROR: User requested feature gcrypt
configure was not able to find it.
Install gcrypt devel >= 1.5.0
--- tests/docker/dockerfiles/debian-amd64.docker | 1 + 1 file changed, 1 insertion(+)
tests/docker/dockerfiles/debian-amd64.docker +1 -0
@@ -16,6 +16,7 @@ RUN apt update && \ apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ + libgcrypt20-dev \ librdmacm-dev \ libsasl2-dev \ libsnappy-dev \
Signature · 1 line
2.21.1
Re: [PATCH-for-5.0 2/4] tests/docker: Install gcrypt devel package in Debian image
8:06 PM Pet, 20.03.2020. Philippe Mathieu-Daudé <[email protected]> је написао/ла:
Quoted 8 lines
Apparently Debian Stretch was listing gcrypt as a QEMU dependency, but this is not the case anymore in Buster, so we need to install it manually (it it not listed by 'apt-get -s build-dep qemu' in the common debian10.docker anymore).
$ ../configure $QEMU_CONFIGURE_OPTS
Quoted 7 lines
ERROR: User requested feature gcrypt
configure was not able to find it.
Install gcrypt devel >= 1.5.0Fixes 698a71edbed & 6f8bbb374beSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
If the problem is caused by Debian Buster change in behavior, I think you should not enumerate QEMU commits as something that is fixed by this patch. That implies that something was wrong with these commits, while they were, I suppose, fine at the moment of their integration.
Very confusing!
If you think that these commit ids deserve to be mentioned, you should say:
"Related commits are..." or similar.
Regards,
Aleksandar
Review
Quoted 4 lines
tests/docker/dockerfiles/debian-amd64.docker | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/tests/docker/dockerfiles/debian-amd64.docker
Quoted 15 lines
index
d4849f509f..957f0bc2e7100644tests/docker/dockerfiles/debian-amd64.docker +1
-1@@ -16,6 +16,7 @@ RUN apt update && \ apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ + libgcrypt20-dev \ librdmacm-dev \ libsasl2-dev \ libsnappy-dev \ --2.21.1
PATCH 3/4 tests/docker: Use Python3 PyYAML in the Fedora image
In reply to Philippe Mathieu-DaudéThe Python2 PyYAML is now pointless, switch to the Python3 version.
--- tests/docker/dockerfiles/fedora.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/dockerfiles/fedora.docker +1 -1
@@ -79,8 +79,8 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ + python3-PyYAML \ python3-sphinx \ - PyYAML \ rdma-core-devel \ SDL2-devel \ snappy-devel \
Signature · 1 line
2.21.1
PATCH 4/4 tests/docker: Add libepoxy and libudev packages to the Fedora image
In reply to Philippe Mathieu-DaudéInstall optional dependencies of QEMU to get better coverage.
--- tests/docker/dockerfiles/fedora.docker | 2 ++ 1 file changed, 2 insertions(+)
tests/docker/dockerfiles/fedora.docker +2 -0
@@ -29,6 +29,7 @@ ENV PACKAGES \ libblockdev-mpath-devel \ libcap-ng-devel \ libcurl-devel \ + libepoxy-devel \ libfdt-devel \ libiscsi-devel \ libjpeg-devel \
@@ -38,6 +39,7 @@ ENV PACKAGES \ libseccomp-devel \ libssh-devel \ libubsan \ + libudev-devel \ libusbx-devel \ libxml2-devel \ libzstd-devel \
Signature · 1 line
2.21.1