* [PATCH v2 1/5] docker: move tests from python2 to python3
2019-09-20 22:12 [PATCH v2 0/5] docker: misc cleanups John Snow
@ 2019-09-20 22:12 ` John Snow
2019-09-21 8:48 ` Philippe Mathieu-Daudé
2019-09-23 16:14 ` Cleber Rosa
2019-09-20 22:12 ` [PATCH v2 2/5] docker: remove 'deprecated' image definitions John Snow
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: John Snow @ 2019-09-20 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, John Snow, Philippe Mathieu-Daudé
As part of the push to drop python2 support, replace any explicit python2
dependencies with python3 versions.
For centos, python2 still exists as an implicit dependency, but by adding
python3 we will be able to build even if the configure script begins to
require python 3.5+.
Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64).
Tested under a custom configure script that requires Python 3.5+.
the travis dockerfile is also moved to using python3, which was tested
by running `make docker-test-build@travis`, which I hope is sufficient.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20190920200049.27216-1-jsnow@redhat.com
---
tests/docker/dockerfiles/centos7.docker | 2 +-
tests/docker/dockerfiles/debian-ports.docker | 2 +-
tests/docker/dockerfiles/debian-sid.docker | 2 +-
tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
tests/docker/dockerfiles/debian10.docker | 2 +-
tests/docker/dockerfiles/debian8.docker | 3 +--
tests/docker/dockerfiles/debian9.docker | 2 +-
tests/docker/dockerfiles/travis.docker | 2 +-
tests/docker/dockerfiles/ubuntu.docker | 2 +-
tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index e0b9d7dbe9..953637065c 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -25,6 +25,7 @@ ENV PACKAGES \
nettle-devel \
perl-Test-Harness \
pixman-devel \
+ python3 \
SDL-devel \
spice-glib-devel \
spice-server-devel \
@@ -34,4 +35,3 @@ ENV PACKAGES \
zlib-devel
RUN yum install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
-
diff --git a/tests/docker/dockerfiles/debian-ports.docker b/tests/docker/dockerfiles/debian-ports.docker
index 61bc3f2993..f1ea8d3bd1 100644
--- a/tests/docker/dockerfiles/debian-ports.docker
+++ b/tests/docker/dockerfiles/debian-ports.docker
@@ -31,6 +31,6 @@ RUN apt-get update && \
git \
pkg-config \
psmisc \
- python \
+ python3 \
texinfo \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker
index 2a1bcc33b2..dcb8e83715 100644
--- a/tests/docker/dockerfiles/debian-sid.docker
+++ b/tests/docker/dockerfiles/debian-sid.docker
@@ -31,5 +31,5 @@ RUN apt update && \
git \
pkg-config \
psmisc \
- python \
+ python3 \
texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
index b9c2e2e531..e6f93f65ee 100644
--- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
+++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
@@ -18,7 +18,7 @@ RUN apt-get update && \
flex \
gettext \
git \
- python-minimal
+ python3-minimal
ENV CPU_LIST csp dc232b dc233c
ENV TOOLCHAIN_RELEASE 2018.02
diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
index 30a78813f2..dad498b52e 100644
--- a/tests/docker/dockerfiles/debian10.docker
+++ b/tests/docker/dockerfiles/debian10.docker
@@ -26,7 +26,7 @@ RUN apt update && \
git \
pkg-config \
psmisc \
- python \
+ python3 \
python3-sphinx \
texinfo \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker
index 1212a85c35..be67023826 100644
--- a/tests/docker/dockerfiles/debian8.docker
+++ b/tests/docker/dockerfiles/debian8.docker
@@ -30,5 +30,4 @@ RUN apt update && \
git \
gnupg \
pkg-config \
- python-minimal
-
+ python3-minimal
diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
index b36f1d4ed8..8cbd742bb5 100644
--- a/tests/docker/dockerfiles/debian9.docker
+++ b/tests/docker/dockerfiles/debian9.docker
@@ -26,7 +26,7 @@ RUN apt update && \
git \
pkg-config \
psmisc \
- python \
+ python3 \
python3-sphinx \
texinfo \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
index e72dc85ca7..ea14da29d9 100644
--- a/tests/docker/dockerfiles/travis.docker
+++ b/tests/docker/dockerfiles/travis.docker
@@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8
RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
RUN apt-get update
RUN apt-get -y build-dep qemu
-RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
+RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr
# Travis tools require PhantomJS / Neo4j / Maven accessible
# in their PATH (QEMU build won't access them).
ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index a4f601395c..f486492224 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -60,7 +60,7 @@ ENV PACKAGES flex bison \
libvte-2.91-dev \
libxen-dev \
make \
- python-yaml \
+ python3-yaml \
python3-sphinx \
sparse \
texinfo \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 883f9bcf31..3cc4f492c4 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -47,7 +47,7 @@ ENV PACKAGES flex bison \
libvte-2.91-dev \
libxen-dev \
make \
- python-yaml \
+ python3-yaml \
python3-sphinx \
sparse \
texinfo \
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 1/5] docker: move tests from python2 to python3
2019-09-20 22:12 ` [PATCH v2 1/5] docker: move tests from python2 to python3 John Snow
@ 2019-09-21 8:48 ` Philippe Mathieu-Daudé
2019-09-23 16:10 ` Cleber Rosa
2019-09-23 16:14 ` Cleber Rosa
1 sibling, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-09-21 8:48 UTC (permalink / raw)
To: John Snow, qemu-devel; +Cc: Fam Zheng, Alex Bennée
On 9/21/19 12:12 AM, John Snow wrote:
> As part of the push to drop python2 support, replace any explicit python2
> dependencies with python3 versions.
>
> For centos, python2 still exists as an implicit dependency, but by adding
> python3 we will be able to build even if the configure script begins to
> require python 3.5+.
>
> Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64).
> Tested under a custom configure script that requires Python 3.5+.
>
> the travis dockerfile is also moved to using python3, which was tested
> by running `make docker-test-build@travis`, which I hope is sufficient.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> Message-id: 20190920200049.27216-1-jsnow@redhat.com
^ remove
v1 has:
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> tests/docker/dockerfiles/centos7.docker | 2 +-
> tests/docker/dockerfiles/debian-ports.docker | 2 +-
> tests/docker/dockerfiles/debian-sid.docker | 2 +-
> tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
> tests/docker/dockerfiles/debian10.docker | 2 +-
> tests/docker/dockerfiles/debian8.docker | 3 +--
If you queue this patch at the end of your series, no need to patch
debian8.docker.
Anyway,
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> tests/docker/dockerfiles/debian9.docker | 2 +-
> tests/docker/dockerfiles/travis.docker | 2 +-
> tests/docker/dockerfiles/ubuntu.docker | 2 +-
> tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
> 10 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> index e0b9d7dbe9..953637065c 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -25,6 +25,7 @@ ENV PACKAGES \
> nettle-devel \
> perl-Test-Harness \
> pixman-devel \
> + python3 \
> SDL-devel \
> spice-glib-devel \
> spice-server-devel \
> @@ -34,4 +35,3 @@ ENV PACKAGES \
> zlib-devel
> RUN yum install -y $PACKAGES
> RUN rpm -q $PACKAGES | sort > /packages.txt
> -
> diff --git a/tests/docker/dockerfiles/debian-ports.docker b/tests/docker/dockerfiles/debian-ports.docker
> index 61bc3f2993..f1ea8d3bd1 100644
> --- a/tests/docker/dockerfiles/debian-ports.docker
> +++ b/tests/docker/dockerfiles/debian-ports.docker
> @@ -31,6 +31,6 @@ RUN apt-get update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker
> index 2a1bcc33b2..dcb8e83715 100644
> --- a/tests/docker/dockerfiles/debian-sid.docker
> +++ b/tests/docker/dockerfiles/debian-sid.docker
> @@ -31,5 +31,5 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> index b9c2e2e531..e6f93f65ee 100644
> --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
> +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> @@ -18,7 +18,7 @@ RUN apt-get update && \
> flex \
> gettext \
> git \
> - python-minimal
> + python3-minimal
>
> ENV CPU_LIST csp dc232b dc233c
> ENV TOOLCHAIN_RELEASE 2018.02
> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
> index 30a78813f2..dad498b52e 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> python3-sphinx \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker
> index 1212a85c35..be67023826 100644
> --- a/tests/docker/dockerfiles/debian8.docker
> +++ b/tests/docker/dockerfiles/debian8.docker
> @@ -30,5 +30,4 @@ RUN apt update && \
> git \
> gnupg \
> pkg-config \
> - python-minimal
> -
> + python3-minimal
> diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
> index b36f1d4ed8..8cbd742bb5 100644
> --- a/tests/docker/dockerfiles/debian9.docker
> +++ b/tests/docker/dockerfiles/debian9.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> python3-sphinx \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
> index e72dc85ca7..ea14da29d9 100644
> --- a/tests/docker/dockerfiles/travis.docker
> +++ b/tests/docker/dockerfiles/travis.docker
> @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8
> RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
> RUN apt-get update
> RUN apt-get -y build-dep qemu
> -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
> +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr
> # Travis tools require PhantomJS / Neo4j / Maven accessible
> # in their PATH (QEMU build won't access them).
> ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index a4f601395c..f486492224 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -60,7 +60,7 @@ ENV PACKAGES flex bison \
> libvte-2.91-dev \
> libxen-dev \
> make \
> - python-yaml \
> + python3-yaml \
> python3-sphinx \
> sparse \
> texinfo \
> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
> index 883f9bcf31..3cc4f492c4 100644
> --- a/tests/docker/dockerfiles/ubuntu1804.docker
> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
> @@ -47,7 +47,7 @@ ENV PACKAGES flex bison \
> libvte-2.91-dev \
> libxen-dev \
> make \
> - python-yaml \
> + python3-yaml \
> python3-sphinx \
> sparse \
> texinfo \
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v2 1/5] docker: move tests from python2 to python3
2019-09-21 8:48 ` Philippe Mathieu-Daudé
@ 2019-09-23 16:10 ` Cleber Rosa
0 siblings, 0 replies; 11+ messages in thread
From: Cleber Rosa @ 2019-09-23 16:10 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Alex Bennée, John Snow, qemu-devel
On Sat, Sep 21, 2019 at 10:48:06AM +0200, Philippe Mathieu-Daudé wrote:
> On 9/21/19 12:12 AM, John Snow wrote:
> > As part of the push to drop python2 support, replace any explicit python2
> > dependencies with python3 versions.
> >
> > For centos, python2 still exists as an implicit dependency, but by adding
> > python3 we will be able to build even if the configure script begins to
> > require python 3.5+.
> >
> > Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64).
> > Tested under a custom configure script that requires Python 3.5+.
> >
> > the travis dockerfile is also moved to using python3, which was tested
> > by running `make docker-test-build@travis`, which I hope is sufficient.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
>
> > Message-id: 20190920200049.27216-1-jsnow@redhat.com
> ^ remove
>
> v1 has:
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
>
> > ---
> > tests/docker/dockerfiles/centos7.docker | 2 +-
> > tests/docker/dockerfiles/debian-ports.docker | 2 +-
> > tests/docker/dockerfiles/debian-sid.docker | 2 +-
> > tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
> > tests/docker/dockerfiles/debian10.docker | 2 +-
> > tests/docker/dockerfiles/debian8.docker | 3 +--
>
> If you queue this patch at the end of your series, no need to patch
> debian8.docker.
>
Yep, agreed.
- Cleber.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/5] docker: move tests from python2 to python3
2019-09-20 22:12 ` [PATCH v2 1/5] docker: move tests from python2 to python3 John Snow
2019-09-21 8:48 ` Philippe Mathieu-Daudé
@ 2019-09-23 16:14 ` Cleber Rosa
1 sibling, 0 replies; 11+ messages in thread
From: Cleber Rosa @ 2019-09-23 16:14 UTC (permalink / raw)
To: John Snow
Cc: Fam Zheng, Philippe Mathieu-Daudé, Alex Bennée, qemu-devel
On Fri, Sep 20, 2019 at 06:12:51PM -0400, John Snow wrote:
> As part of the push to drop python2 support, replace any explicit python2
> dependencies with python3 versions.
>
> For centos, python2 still exists as an implicit dependency, but by adding
> python3 we will be able to build even if the configure script begins to
> require python 3.5+.
>
> Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64).
> Tested under a custom configure script that requires Python 3.5+.
>
> the travis dockerfile is also moved to using python3, which was tested
> by running `make docker-test-build@travis`, which I hope is sufficient.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> Message-id: 20190920200049.27216-1-jsnow@redhat.com
> ---
> tests/docker/dockerfiles/centos7.docker | 2 +-
> tests/docker/dockerfiles/debian-ports.docker | 2 +-
> tests/docker/dockerfiles/debian-sid.docker | 2 +-
> tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
> tests/docker/dockerfiles/debian10.docker | 2 +-
> tests/docker/dockerfiles/debian8.docker | 3 +--
> tests/docker/dockerfiles/debian9.docker | 2 +-
> tests/docker/dockerfiles/travis.docker | 2 +-
> tests/docker/dockerfiles/ubuntu.docker | 2 +-
> tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
> 10 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
> index e0b9d7dbe9..953637065c 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -25,6 +25,7 @@ ENV PACKAGES \
> nettle-devel \
> perl-Test-Harness \
> pixman-devel \
> + python3 \
> SDL-devel \
> spice-glib-devel \
> spice-server-devel \
> @@ -34,4 +35,3 @@ ENV PACKAGES \
> zlib-devel
> RUN yum install -y $PACKAGES
> RUN rpm -q $PACKAGES | sort > /packages.txt
> -
> diff --git a/tests/docker/dockerfiles/debian-ports.docker b/tests/docker/dockerfiles/debian-ports.docker
> index 61bc3f2993..f1ea8d3bd1 100644
> --- a/tests/docker/dockerfiles/debian-ports.docker
> +++ b/tests/docker/dockerfiles/debian-ports.docker
> @@ -31,6 +31,6 @@ RUN apt-get update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker
> index 2a1bcc33b2..dcb8e83715 100644
> --- a/tests/docker/dockerfiles/debian-sid.docker
> +++ b/tests/docker/dockerfiles/debian-sid.docker
> @@ -31,5 +31,5 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> index b9c2e2e531..e6f93f65ee 100644
> --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
> +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> @@ -18,7 +18,7 @@ RUN apt-get update && \
> flex \
> gettext \
> git \
> - python-minimal
> + python3-minimal
>
> ENV CPU_LIST csp dc232b dc233c
> ENV TOOLCHAIN_RELEASE 2018.02
> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
> index 30a78813f2..dad498b52e 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> python3-sphinx \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker
> index 1212a85c35..be67023826 100644
> --- a/tests/docker/dockerfiles/debian8.docker
> +++ b/tests/docker/dockerfiles/debian8.docker
> @@ -30,5 +30,4 @@ RUN apt update && \
> git \
> gnupg \
> pkg-config \
> - python-minimal
> -
> + python3-minimal
> diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
> index b36f1d4ed8..8cbd742bb5 100644
> --- a/tests/docker/dockerfiles/debian9.docker
> +++ b/tests/docker/dockerfiles/debian9.docker
> @@ -26,7 +26,7 @@ RUN apt update && \
> git \
> pkg-config \
> psmisc \
> - python \
> + python3 \
> python3-sphinx \
> texinfo \
> $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
> index e72dc85ca7..ea14da29d9 100644
> --- a/tests/docker/dockerfiles/travis.docker
> +++ b/tests/docker/dockerfiles/travis.docker
> @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8
> RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list
> RUN apt-get update
> RUN apt-get -y build-dep qemu
> -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
> +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf gdb strace lsof net-tools gcovr
> # Travis tools require PhantomJS / Neo4j / Maven accessible
> # in their PATH (QEMU build won't access them).
> ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index a4f601395c..f486492224 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -60,7 +60,7 @@ ENV PACKAGES flex bison \
> libvte-2.91-dev \
> libxen-dev \
> make \
> - python-yaml \
> + python3-yaml \
> python3-sphinx \
> sparse \
> texinfo \
> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
> index 883f9bcf31..3cc4f492c4 100644
> --- a/tests/docker/dockerfiles/ubuntu1804.docker
> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
> @@ -47,7 +47,7 @@ ENV PACKAGES flex bison \
> libvte-2.91-dev \
> libxen-dev \
> make \
> - python-yaml \
> + python3-yaml \
> python3-sphinx \
> sparse \
> texinfo \
> --
> 2.21.0
>
>
With the exception of debian8.docker, as noted in v1 and as addressed
later in this series:
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 2/5] docker: remove 'deprecated' image definitions
2019-09-20 22:12 [PATCH v2 0/5] docker: misc cleanups John Snow
2019-09-20 22:12 ` [PATCH v2 1/5] docker: move tests from python2 to python3 John Snow
@ 2019-09-20 22:12 ` John Snow
2019-09-20 22:12 ` [PATCH v2 3/5] docker: remove debian8-mxe definitions John Snow
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: John Snow @ 2019-09-20 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, John Snow, Philippe Mathieu-Daudé
There isn't a debian.dockerfile anymore,
so perform some ghost-busting.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20190920001413.22567-2-jsnow@redhat.com
---
tests/docker/Makefile.include | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index d796f71b63..0d75260e46 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,11 +4,10 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_DEPRECATED_IMAGES := debian
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid
+DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid
DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
-DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
+DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -159,7 +158,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user
DOCKER_USER_IMAGES += debian-powerpc-user
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \
+$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 3/5] docker: remove debian8-mxe definitions
2019-09-20 22:12 [PATCH v2 0/5] docker: misc cleanups John Snow
2019-09-20 22:12 ` [PATCH v2 1/5] docker: move tests from python2 to python3 John Snow
2019-09-20 22:12 ` [PATCH v2 2/5] docker: remove 'deprecated' image definitions John Snow
@ 2019-09-20 22:12 ` John Snow
2019-09-21 8:45 ` Philippe Mathieu-Daudé
2019-09-20 22:12 ` [PATCH v2 4/5] docker: remove unused debian-sid and debian-ports John Snow
2019-09-20 22:12 ` [PATCH v2 5/5] docker: removed unused debian8 partial image John Snow
4 siblings, 1 reply; 11+ messages in thread
From: John Snow @ 2019-09-20 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, John Snow, Philippe Mathieu-Daudé
We don't have a debian8-mxe dockerfile anymore.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20190920001413.22567-3-jsnow@redhat.com
---
tests/docker/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 0d75260e46..0a7fc8bc79 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid
-DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
+DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 3/5] docker: remove debian8-mxe definitions
2019-09-20 22:12 ` [PATCH v2 3/5] docker: remove debian8-mxe definitions John Snow
@ 2019-09-21 8:45 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-09-21 8:45 UTC (permalink / raw)
To: John Snow, qemu-devel; +Cc: Fam Zheng, Alex Bennée
On 9/21/19 12:12 AM, John Snow wrote:
> We don't have a debian8-mxe dockerfile anymore.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> Message-id: 20190920001413.22567-3-jsnow@redhat.com
^ remove?
Fixes: 67bd36beda1ae
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/docker/Makefile.include | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 0d75260e46..0a7fc8bc79 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker
> DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> # we don't run tests on intermediate images (used as base by another image)
> DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid
> -DOCKER_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
> +DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
> DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
> DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
> # Use a global constant ccache directory to speed up repetitive builds
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 4/5] docker: remove unused debian-sid and debian-ports
2019-09-20 22:12 [PATCH v2 0/5] docker: misc cleanups John Snow
` (2 preceding siblings ...)
2019-09-20 22:12 ` [PATCH v2 3/5] docker: remove debian8-mxe definitions John Snow
@ 2019-09-20 22:12 ` John Snow
2019-09-20 22:12 ` [PATCH v2 5/5] docker: removed unused debian8 partial image John Snow
4 siblings, 0 replies; 11+ messages in thread
From: John Snow @ 2019-09-20 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, John Snow, Philippe Mathieu-Daudé
These are listed as "partial" images, but have no user.
Remove them.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20190920001413.22567-4-jsnow@redhat.com
---
tests/docker/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 0a7fc8bc79..cb41652885 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -5,8 +5,8 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10 debian-sid
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10
+DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 5/5] docker: removed unused debian8 partial image
2019-09-20 22:12 [PATCH v2 0/5] docker: misc cleanups John Snow
` (3 preceding siblings ...)
2019-09-20 22:12 ` [PATCH v2 4/5] docker: remove unused debian-sid and debian-ports John Snow
@ 2019-09-20 22:12 ` John Snow
2019-09-21 8:42 ` Philippe Mathieu-Daudé
4 siblings, 1 reply; 11+ messages in thread
From: John Snow @ 2019-09-20 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, John Snow, Philippe Mathieu-Daudé
debian8 partial base is also not consumed by any image, so remove it.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/docker/Makefile.include | 3 +--
tests/docker/dockerfiles/debian8.docker | 33 -------------------------
2 files changed, 1 insertion(+), 35 deletions(-)
delete mode 100644 tests/docker/dockerfiles/debian8.docker
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index cb41652885..b9430822b8 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -5,8 +5,7 @@
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
+DOCKER_PARTIAL_IMAGES := debian9 debian9-mxe debian10 debian-bootstrap
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
# Use a global constant ccache directory to speed up repetitive builds
diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker
deleted file mode 100644
index be67023826..0000000000
--- a/tests/docker/dockerfiles/debian8.docker
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Docker multiarch cross-compiler target
-#
-# This docker target is builds on Debian and Emdebian's cross compiler targets
-# to build distro with a selection of cross compilers for building test binaries.
-#
-# On its own you can't build much but the docker-foo-cross targets
-# build on top of the base debian image.
-#
-FROM debian:jessie-slim
-
-MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
-
-# Setup some basic tools we need
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- bison \
- binutils-multiarch \
- build-essential \
- ca-certificates \
- clang \
- curl \
- flex \
- gettext \
- git \
- gnupg \
- pkg-config \
- python3-minimal
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 5/5] docker: removed unused debian8 partial image
2019-09-20 22:12 ` [PATCH v2 5/5] docker: removed unused debian8 partial image John Snow
@ 2019-09-21 8:42 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-09-21 8:42 UTC (permalink / raw)
To: John Snow, qemu-devel; +Cc: Fam Zheng, Alex Bennée
On 9/21/19 12:12 AM, John Snow wrote:
> debian8 partial base is also not consumed by any image, so remove it.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> tests/docker/Makefile.include | 3 +--
> tests/docker/dockerfiles/debian8.docker | 33 -------------------------
> 2 files changed, 1 insertion(+), 35 deletions(-)
> delete mode 100644 tests/docker/dockerfiles/debian8.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index cb41652885..b9430822b8 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -5,8 +5,7 @@
> DOCKER_SUFFIX := .docker
> DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> # we don't run tests on intermediate images (used as base by another image)
> -DOCKER_PARTIAL_IMAGES := debian8 debian9 debian10
> -DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
> +DOCKER_PARTIAL_IMAGES := debian9 debian9-mxe debian10 debian-bootstrap
> DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
> DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
> # Use a global constant ccache directory to speed up repetitive builds
> diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerfiles/debian8.docker
> deleted file mode 100644
> index be67023826..0000000000
> --- a/tests/docker/dockerfiles/debian8.docker
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -#
> -# Docker multiarch cross-compiler target
> -#
> -# This docker target is builds on Debian and Emdebian's cross compiler targets
> -# to build distro with a selection of cross compilers for building test binaries.
> -#
> -# On its own you can't build much but the docker-foo-cross targets
> -# build on top of the base debian image.
> -#
> -FROM debian:jessie-slim
> -
> -MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
> -
> -# Duplicate deb line as deb-src
> -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
> -
> -# Setup some basic tools we need
> -RUN apt update && \
> - DEBIAN_FRONTEND=noninteractive apt-get install -yy eatmydata && \
> - DEBIAN_FRONTEND=noninteractive eatmydata \
> - apt-get install -y --no-install-recommends \
> - bison \
> - binutils-multiarch \
> - build-essential \
> - ca-certificates \
> - clang \
> - curl \
> - flex \
> - gettext \
> - git \
> - gnupg \
> - pkg-config \
> - python3-minimal
>
^ permalink raw reply [flat|nested] 11+ messages in thread