From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, "John Snow" <jsnow@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 27/28] docker: move tests from python2 to python3
Date: Thu, 26 Sep 2019 19:35:52 +0100 [thread overview]
Message-ID: <20190926183553.13895-28-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org>
From: John Snow <jsnow@redhat.com>
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: <20190923181140.7235-7-jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
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-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/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.20.1
next prev parent reply other threads:[~2019-09-26 18:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 18:35 [PULL 00/28] testing updates (docker,podman,tcg,alpha) Alex Bennée
2019-09-26 18:35 ` [PULL 01/28] target/alpha: Use array for FPCR_DYN conversion Alex Bennée
2019-09-26 18:35 ` [PULL 02/28] target/alpha: Fix SWCR_MAP_UMZ Alex Bennée
2019-09-26 18:35 ` [PULL 03/28] target/alpha: Fix SWCR_TRAP_ENABLE_MASK Alex Bennée
2019-09-26 18:35 ` [PULL 04/28] target/alpha: Handle SWCR_MAP_DMZ earlier Alex Bennée
2019-09-26 18:35 ` [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once Alex Bennée
2019-09-26 18:35 ` [PULL 06/28] target/alpha: Mask IOV exception with INV for user-only Alex Bennée
2019-09-26 18:35 ` [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s Alex Bennée
2019-09-26 18:35 ` [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32 Alex Bennée
2019-09-26 18:35 ` [PULL 09/28] tests/docker: add sanitizers back to clang build Alex Bennée
2019-10-01 7:36 ` Paolo Bonzini
2019-10-01 13:04 ` John Snow
2019-09-26 18:35 ` [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-26 18:35 ` [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe Alex Bennée
2019-09-26 18:35 ` [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up Alex Bennée
2019-09-26 18:35 ` [PULL 13/28] podman: fix command invocation Alex Bennée
2019-09-26 18:35 ` [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling Alex Bennée
2019-09-26 18:35 ` [PULL 15/28] tests/tcg: re-enable linux-test for ppc64abi32 Alex Bennée
2019-09-26 18:35 ` [PULL 16/28] tests/tcg: add float_madds test to multiarch Alex Bennée
2019-09-26 18:35 ` [PULL 17/28] tests/tcg: add generic version of float_convs Alex Bennée
2019-09-26 18:35 ` [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64 Alex Bennée
2019-09-26 18:35 ` [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds Alex Bennée
2019-09-26 18:35 ` [PULL 20/28] docs/devel: add "check-tcg" to testing.rst Alex Bennée
2019-09-26 18:35 ` [PULL 21/28] target/i386: Fix broken build with WHPX enabled Alex Bennée
2019-09-26 18:35 ` [PULL 22/28] docker: remove debian8-mxe definitions Alex Bennée
2019-09-26 18:35 ` [PULL 23/28] docker: remove unused debian8 partial image Alex Bennée
2019-09-26 18:35 ` [PULL 24/28] docker: remove 'deprecated' image definitions Alex Bennée
2019-09-26 18:35 ` [PULL 25/28] docker: remove unused debian-ports Alex Bennée
2019-09-26 18:35 ` [PULL 26/28] docker: remove unused debian-sid Alex Bennée
2019-09-26 18:35 ` Alex Bennée [this message]
2019-09-26 18:35 ` [PULL 28/28] tests/docker: remove debian-powerpc-user-cross Alex Bennée
2019-09-27 15:53 ` [PULL 00/28] testing updates (docker,podman,tcg,alpha) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190926183553.13895-28-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).