tests/docker: auto-generate fedora.docker with lcitool

This commit is best examined using the "-b" option to diff.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-10-berrange@redhat.com>
Message-Id: <20220105135009.1584676-10-alex.bennee@linaro.org>

tests/docker/dockerfiles/fedora.docker

@@ -1,10 +1,27 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool dockerfile fedora-35 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
 FROM registry.fedoraproject.org/fedora:35
 
-# Please keep this list sorted alphabetically
+RUN dnf install -y nosync && \
-ENV PACKAGES \
+    echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+    chmod +x /usr/bin/nosync && \
+    nosync dnf update -y && \
+    nosync dnf install -y \
         SDL2-devel \
         SDL2_image-devel \
         alsa-lib-devel \
+        bash \
         bc \
         brlapi-devel \
         bzip2 \
@@ -27,6 +44,7 @@ ENV PACKAGES \
         gettext \
         git \
         glib2-devel \
+        glib2-static \
         glibc-langpack-en \
         glibc-static \
         glusterfs-api-devel \
@@ -76,6 +94,7 @@ ENV PACKAGES \
         numactl-devel \
         openssh-clients \
         pam-devel \
+        pcre-static \
         perl-Test-Harness \
         perl-base \
         pixman-devel \
@@ -110,9 +129,20 @@ ENV PACKAGES \
         which \
         xen-devel \
         xfsprogs-devel \
-    zlib-devel
+        zlib-devel \
-ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
+        zlib-static && \
+    nosync dnf autoremove -y && \
+    nosync dnf clean all -y && \
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN dnf install -y $PACKAGES
+ENV LANG "en_US.UTF-8"
-RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV MAKE "/usr/bin/make"
-ENV PATH $PATH:/usr/libexec/python3-sphinx/
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

tests/lcitool/refresh

@@ -62,6 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
 
 try:
    generate_dockerfile("centos8", "centos-8")
+   generate_dockerfile("fedora", "fedora-35")
 
    sys.exit(0)
 except Exception as ex: