[Qemu-devel] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image

[Philippe Mathieu-Daudé]

Rebuilding the Fedora image is failing:

  $ make docker-image-fedora V=1
  [...]
  Step 4/8 : RUN dnf install -y $PACKAGES
   ---> Running in cef9615efafb
  Fedora Modular 30 - x86_64                      2.0 MB/s | 2.7 MB     00:01
  Fedora Modular 30 - x86_64 - Updates            1.6 MB/s | 2.3 MB     00:01
  Fedora 30 - x86_64 - Updates                    6.1 MB/s |  17 MB     00:02
  Failed to synchronize cache for repo 'updates'
  Error: Failed to synchronize cache for repo 'updates'
  The command '/bin/sh -c dnf install -y $PACKAGES' returned a non-zero code: 1
  Traceback (most recent call last):
    File "./tests/docker/docker.py", line 615, in <module>
      sys.exit(main())
    File "./tests/docker/docker.py", line 611, in main
      return args.cmdobj.run(args, argv)
    File "./tests/docker/docker.py", line 413, in run
      extra_files_cksum=cksum)
    File "./tests/docker/docker.py", line 280, in build_image
      quiet=quiet)
    File "./tests/docker/docker.py", line 207, in _do_check
      return subprocess.check_call(self._command + cmd, **kwargs)
    File "/usr/lib64/python2.7/subprocess.py", line 190, in check_call
      raise CalledProcessError(retcode, cmd)
  subprocess.CalledProcessError: Command '['docker', 'build', '-t', 
'qemu:fedora', '-f', '/tmp/docker_buildbKtWAa/tmpIctHw2.docker', 
'/tmp/docker_buildbKtWAa']' returned non-zero exit status 1
  make: *** [tests/docker/Makefile.include:53: docker-image-fedora] Error 1

The fix found in one of the comment from this thread helped to have
it working again: https://bugzilla.redhat.com/show_bug.cgi?id=1706627

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
I have no idea what it does, it just works (TM).
---
 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 e6d39e14cb..f6be5e2dd7 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -94,6 +94,7 @@ ENV PACKAGES \
     zlib-devel
 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
 
-RUN dnf install -y $PACKAGES
+RUN echo zchunk=False >> /etc/dnf/dnf.conf
+RUN dnf clean metadata && dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
 ENV FEATURES mingw clang pyyaml asan
-- 
2.20.1