From a6f7ed6e72ca44e2f39c790f7c04d1a012e381dc Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 26 May 2022 08:37:53 +0200
Subject: [PATCH] ci: Add Fedora 36

The target is intentionally not added to the integration tests
at this time, because the corresponding VM template is not yet
available on the runner. A later patch will take care of that.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 ci/containers/fedora-36.Dockerfile | 108 +++++++++++++++++++++++++++++
 ci/gitlab/builds.yml               |  10 +++
 ci/gitlab/containers.yml           |   7 ++
 ci/manifest.yml                    |   2 +
 4 files changed, 127 insertions(+)
 create mode 100644 ci/containers/fedora-36.Dockerfile

diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile
new file mode 100644
index 0000000000..f99ba502c5
--- /dev/null
+++ b/ci/containers/fedora-36.Dockerfile
@@ -0,0 +1,108 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM registry.fedoraproject.org/fedora:36
+
+RUN dnf install -y nosync && \
+    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 \
+        audit-libs-devel \
+        augeas \
+        bash-completion \
+        ca-certificates \
+        ccache \
+        clang \
+        codespell \
+        cpp \
+        cppi \
+        cyrus-sasl-devel \
+        device-mapper-devel \
+        diffutils \
+        dwarves \
+        ebtables \
+        firewalld-filesystem \
+        fuse-devel \
+        gcc \
+        gettext \
+        git \
+        glib2-devel \
+        glibc-devel \
+        glibc-langpack-en \
+        glusterfs-api-devel \
+        gnutls-devel \
+        grep \
+        iproute \
+        iproute-tc \
+        iptables \
+        iscsi-initiator-utils \
+        kmod \
+        libacl-devel \
+        libattr-devel \
+        libblkid-devel \
+        libcap-ng-devel \
+        libcurl-devel \
+        libiscsi-devel \
+        libnl3-devel \
+        libpcap-devel \
+        libpciaccess-devel \
+        librbd-devel \
+        libselinux-devel \
+        libssh-devel \
+        libssh2-devel \
+        libtirpc-devel \
+        libwsman-devel \
+        libxml2 \
+        libxml2-devel \
+        libxslt \
+        lvm2 \
+        make \
+        meson \
+        nfs-utils \
+        ninja-build \
+        numactl-devel \
+        numad \
+        parted-devel \
+        perl-base \
+        pkgconfig \
+        polkit \
+        python3 \
+        python3-docutils \
+        python3-flake8 \
+        qemu-img \
+        readline-devel \
+        rpcgen \
+        rpm-build \
+        sanlock-devel \
+        scrub \
+        sed \
+        sheepdog \
+        systemd-devel \
+        systemtap-sdt-devel \
+        wireshark-devel \
+        xen-devel \
+        yajl-devel && \
+    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/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 8d8ac7bc8a..b55143018b 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -142,6 +142,16 @@ x86_64-fedora-35:
       - libvirt-rpms
 
 
+x86_64-fedora-36:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-fedora-36-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-36
+
+
 x86_64-fedora-rawhide:
   extends: .native_build_job
   needs:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 12ab6e4808..635bc516e3 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -77,6 +77,13 @@ x86_64-fedora-35-container:
     NAME: fedora-35
 
 
+x86_64-fedora-36-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-36
+
+
 x86_64-fedora-rawhide-container:
   extends: .container_job
   allow_failure: true
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 47bed03130..8c43d2e917 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -158,6 +158,8 @@ targets:
 
       - arch: mingw64
 
+  fedora-36: x86_64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64