On Mon, Jan 15, 2018 at 07:47:29AM -0300, Philippe Mathieu-Daudé wrote: > Hi Daniel, > > On 01/15/2018 07:26 AM, Daniel P. Berrange wrote: > > Fedora has switched to Python 3 by default, so it makes sense to use that > > for testing QEMU builds, so we get testing of Python 3 compatibility. > > I'd rather keep Fedora 25 with Python 2, and use Python 3 in Fedora 27.
FYI, Fedora 25 went end of life 2 weeks ago, so I'm not sure it is worth keeping that around in QEMU CI all that much much longer. To your general point though - I just picked Fedora since all non-EOL versions of Fedora now ship with Python3 only by default. I'm happy to see any arbitrary combo of Docker images changed, as long as we get a nice mixture of python 2/3 versions covered across the set. So feel free to suggest anything that gets us good coverage of 2+3. > If you agree, I can apply this patch once your series is merged, on top > of http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg02569.html > > relevant patches: > http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg02574.html > http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg02575.html > > > > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > > --- > > tests/docker/dockerfiles/fedora.docker | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/tests/docker/dockerfiles/fedora.docker > > b/tests/docker/dockerfiles/fedora.docker > > index 4b26c3aded..a22fe16157 100644 > > --- a/tests/docker/dockerfiles/fedora.docker > > +++ b/tests/docker/dockerfiles/fedora.docker > > @@ -1,6 +1,6 @@ > > FROM fedora:latest > > ENV PACKAGES \ > > - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname > > \ > > + ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname > > \ > > glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ > > gcc gcc-c++ clang make perl which bc findutils libaio-devel \ > > nettle-devel \ > > @@ -12,6 +12,7 @@ ENV PACKAGES \ > > mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle > > mingw64-libtasn1 \ > > mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ > > mingw64-bzip2 > > +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 > > > > RUN dnf install -y $PACKAGES > > RUN rpm -q $PACKAGES | sort > /packages.txt > > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|