ci: Refresh and add Fedora 37 target

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/ci/buildenv/fedora-35.sh b/ci/buildenv/fedora-35.sh
deleted file mode 100644 (file)
index 2ee8c90..0000000
--- a/ci/buildenv/fedora-35.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    dnf update -y
-    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 \
-        netcf-devel \
-        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 \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xen-devel \
-        yajl-devel
-    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
-}
-
-export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
-export LANG="en_US.UTF-8"
-export MAKE="/usr/bin/make"
-export NINJA="/usr/bin/ninja"
-export PYTHON="/usr/bin/python3"

diff --git a/ci/buildenv/fedora-36-cross-mingw32.sh b/ci/buildenv/fedora-36-cross-mingw32.sh
deleted file mode 100644 (file)
index a45c848..0000000
--- a/ci/buildenv/fedora-36-cross-mingw32.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    dnf update -y
-    dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        systemd-rpm-macros
-    dnf install -y \
-        mingw32-curl \
-        mingw32-dlfcn \
-        mingw32-gcc \
-        mingw32-gettext \
-        mingw32-glib2 \
-        mingw32-gnutls \
-        mingw32-headers \
-        mingw32-libssh2 \
-        mingw32-libxml2 \
-        mingw32-pkg-config \
-        mingw32-portablexdr \
-        mingw32-readline
-    rpm -qa | sort > /packages.txt
-    mkdir -p /usr/libexec/ccache-wrappers
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-}
-
-export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
-export LANG="en_US.UTF-8"
-export MAKE="/usr/bin/make"
-export NINJA="/usr/bin/ninja"
-export PYTHON="/usr/bin/python3"
-
-export ABI="i686-w64-mingw32"
-export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw32.meson"

diff --git a/ci/buildenv/fedora-36-cross-mingw64.sh b/ci/buildenv/fedora-36-cross-mingw64.sh
deleted file mode 100644 (file)
index 1e2b2ba..0000000
--- a/ci/buildenv/fedora-36-cross-mingw64.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    dnf update -y
-    dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        systemd-rpm-macros
-    dnf install -y \
-        mingw64-curl \
-        mingw64-dlfcn \
-        mingw64-gcc \
-        mingw64-gettext \
-        mingw64-glib2 \
-        mingw64-gnutls \
-        mingw64-headers \
-        mingw64-libssh2 \
-        mingw64-libxml2 \
-        mingw64-pkg-config \
-        mingw64-portablexdr \
-        mingw64-readline
-    rpm -qa | sort > /packages.txt
-    mkdir -p /usr/libexec/ccache-wrappers
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-}
-
-export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
-export LANG="en_US.UTF-8"
-export MAKE="/usr/bin/make"
-export NINJA="/usr/bin/ninja"
-export PYTHON="/usr/bin/python3"
-
-export ABI="x86_64-w64-mingw32"
-export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw64.meson"

diff --git a/ci/buildenv/fedora-37-cross-mingw32.sh b/ci/buildenv/fedora-37-cross-mingw32.sh
new file mode 100644 (file)
index 0000000..a45c848
--- /dev/null
+++ b/ci/buildenv/fedora-37-cross-mingw32.sh
@@ -0,0 +1,74 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+function install_buildenv() {
+    dnf update -y
+    dnf install -y \
+        augeas \
+        bash-completion \
+        ca-certificates \
+        ccache \
+        codespell \
+        cpp \
+        cppi \
+        diffutils \
+        dwarves \
+        ebtables \
+        firewalld-filesystem \
+        git \
+        glibc-langpack-en \
+        grep \
+        iproute \
+        iproute-tc \
+        iptables \
+        iscsi-initiator-utils \
+        kmod \
+        libxml2 \
+        libxslt \
+        lvm2 \
+        make \
+        meson \
+        nfs-utils \
+        ninja-build \
+        numad \
+        perl-base \
+        polkit \
+        python3 \
+        python3-docutils \
+        python3-flake8 \
+        qemu-img \
+        rpcgen \
+        rpm-build \
+        scrub \
+        sed \
+        systemd-rpm-macros
+    dnf install -y \
+        mingw32-curl \
+        mingw32-dlfcn \
+        mingw32-gcc \
+        mingw32-gettext \
+        mingw32-glib2 \
+        mingw32-gnutls \
+        mingw32-headers \
+        mingw32-libssh2 \
+        mingw32-libxml2 \
+        mingw32-pkg-config \
+        mingw32-portablexdr \
+        mingw32-readline
+    rpm -qa | sort > /packages.txt
+    mkdir -p /usr/libexec/ccache-wrappers
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
+}
+
+export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
+export LANG="en_US.UTF-8"
+export MAKE="/usr/bin/make"
+export NINJA="/usr/bin/ninja"
+export PYTHON="/usr/bin/python3"
+
+export ABI="i686-w64-mingw32"
+export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw32.meson"

diff --git a/ci/buildenv/fedora-37-cross-mingw64.sh b/ci/buildenv/fedora-37-cross-mingw64.sh
new file mode 100644 (file)
index 0000000..1e2b2ba
--- /dev/null
+++ b/ci/buildenv/fedora-37-cross-mingw64.sh
@@ -0,0 +1,74 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+function install_buildenv() {
+    dnf update -y
+    dnf install -y \
+        augeas \
+        bash-completion \
+        ca-certificates \
+        ccache \
+        codespell \
+        cpp \
+        cppi \
+        diffutils \
+        dwarves \
+        ebtables \
+        firewalld-filesystem \
+        git \
+        glibc-langpack-en \
+        grep \
+        iproute \
+        iproute-tc \
+        iptables \
+        iscsi-initiator-utils \
+        kmod \
+        libxml2 \
+        libxslt \
+        lvm2 \
+        make \
+        meson \
+        nfs-utils \
+        ninja-build \
+        numad \
+        perl-base \
+        polkit \
+        python3 \
+        python3-docutils \
+        python3-flake8 \
+        qemu-img \
+        rpcgen \
+        rpm-build \
+        scrub \
+        sed \
+        systemd-rpm-macros
+    dnf install -y \
+        mingw64-curl \
+        mingw64-dlfcn \
+        mingw64-gcc \
+        mingw64-gettext \
+        mingw64-glib2 \
+        mingw64-gnutls \
+        mingw64-headers \
+        mingw64-libssh2 \
+        mingw64-libxml2 \
+        mingw64-pkg-config \
+        mingw64-portablexdr \
+        mingw64-readline
+    rpm -qa | sort > /packages.txt
+    mkdir -p /usr/libexec/ccache-wrappers
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
+}
+
+export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
+export LANG="en_US.UTF-8"
+export MAKE="/usr/bin/make"
+export NINJA="/usr/bin/ninja"
+export PYTHON="/usr/bin/python3"
+
+export ABI="x86_64-w64-mingw32"
+export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw64.meson"

diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-37.sh
new file mode 100644 (file)
index 0000000..23886ae
--- /dev/null
+++ b/ci/buildenv/fedora-37.sh
@@ -0,0 +1,96 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+function install_buildenv() {
+    dnf update -y
+    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 \
+        systemd-devel \
+        systemd-rpm-macros \
+        systemtap-sdt-devel \
+        wireshark-devel \
+        xen-devel \
+        yajl-devel
+    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
+}
+
+export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
+export LANG="en_US.UTF-8"
+export MAKE="/usr/bin/make"
+export NINJA="/usr/bin/ninja"
+export PYTHON="/usr/bin/python3"

diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars
index a5afb4eb4d86b405e9e1249235ef070afcdd6d04..8ecc9c44507a19c0a8830f69fb89d1f37a3d0f8e 100644 (file)
--- a/ci/cirrus/macos-12.vars
+++ b/ci/cirrus/macos-12.vars
@@ -4,13 +4,13 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-CCACHE='/usr/local/bin/ccache'
+CCACHE='/opt/homebrew/bin/ccache'
 CPAN_PKGS=''
 CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
-PIP3='/usr/local/bin/pip3'
+PIP3='/opt/homebrew/bin/pip3'
 PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
 PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
+PYTHON='/opt/homebrew/bin/python3'

diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile
deleted file mode 100644 (file)
index f517cf9..0000000
--- a/ci/containers/fedora-35.Dockerfile
+++ /dev/null
@@ -1,109 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:35
-
-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 \
-               netcf-devel \
-               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 \
-               systemd-devel \
-               systemd-rpm-macros \
-               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 CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"

diff --git a/ci/containers/fedora-36-cross-mingw32.Dockerfile b/ci/containers/fedora-36-cross-mingw32.Dockerfile
deleted file mode 100644 (file)
index 24b2760..0000000
--- a/ci/containers/fedora-36-cross-mingw32.Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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 \
-               augeas \
-               bash-completion \
-               ca-certificates \
-               ccache \
-               codespell \
-               cpp \
-               cppi \
-               diffutils \
-               dwarves \
-               ebtables \
-               firewalld-filesystem \
-               git \
-               glibc-langpack-en \
-               grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
-               libxml2 \
-               libxslt \
-               lvm2 \
-               make \
-               meson \
-               nfs-utils \
-               ninja-build \
-               numad \
-               perl-base \
-               polkit \
-               python3 \
-               python3-docutils \
-               python3-flake8 \
-               qemu-img \
-               rpcgen \
-               rpm-build \
-               scrub \
-               sed \
-               systemd-rpm-macros && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-
-RUN nosync dnf install -y \
-               mingw32-curl \
-               mingw32-dlfcn \
-               mingw32-gcc \
-               mingw32-gettext \
-               mingw32-glib2 \
-               mingw32-gnutls \
-               mingw32-headers \
-               mingw32-libssh2 \
-               mingw32-libxml2 \
-               mingw32-pkg-config \
-               mingw32-portablexdr \
-               mingw32-readline && \
-    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/i686-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-
-ENV ABI "i686-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"

diff --git a/ci/containers/fedora-36-cross-mingw64.Dockerfile b/ci/containers/fedora-36-cross-mingw64.Dockerfile
deleted file mode 100644 (file)
index a336920..0000000
--- a/ci/containers/fedora-36-cross-mingw64.Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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 \
-               augeas \
-               bash-completion \
-               ca-certificates \
-               ccache \
-               codespell \
-               cpp \
-               cppi \
-               diffutils \
-               dwarves \
-               ebtables \
-               firewalld-filesystem \
-               git \
-               glibc-langpack-en \
-               grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
-               libxml2 \
-               libxslt \
-               lvm2 \
-               make \
-               meson \
-               nfs-utils \
-               ninja-build \
-               numad \
-               perl-base \
-               polkit \
-               python3 \
-               python3-docutils \
-               python3-flake8 \
-               qemu-img \
-               rpcgen \
-               rpm-build \
-               scrub \
-               sed \
-               systemd-rpm-macros && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-
-RUN nosync dnf install -y \
-               mingw64-curl \
-               mingw64-dlfcn \
-               mingw64-gcc \
-               mingw64-gettext \
-               mingw64-glib2 \
-               mingw64-gnutls \
-               mingw64-headers \
-               mingw64-libssh2 \
-               mingw64-libxml2 \
-               mingw64-pkg-config \
-               mingw64-portablexdr \
-               mingw64-readline && \
-    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/x86_64-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-
-ENV ABI "x86_64-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"

diff --git a/ci/containers/fedora-37-cross-mingw32.Dockerfile b/ci/containers/fedora-37-cross-mingw32.Dockerfile
new file mode 100644 (file)
index 0000000..14fb25a
--- /dev/null
+++ b/ci/containers/fedora-37-cross-mingw32.Dockerfile
@@ -0,0 +1,88 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM registry.fedoraproject.org/fedora:37
+
+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 \
+               augeas \
+               bash-completion \
+               ca-certificates \
+               ccache \
+               codespell \
+               cpp \
+               cppi \
+               diffutils \
+               dwarves \
+               ebtables \
+               firewalld-filesystem \
+               git \
+               glibc-langpack-en \
+               grep \
+               iproute \
+               iproute-tc \
+               iptables \
+               iscsi-initiator-utils \
+               kmod \
+               libxml2 \
+               libxslt \
+               lvm2 \
+               make \
+               meson \
+               nfs-utils \
+               ninja-build \
+               numad \
+               perl-base \
+               polkit \
+               python3 \
+               python3-docutils \
+               python3-flake8 \
+               qemu-img \
+               rpcgen \
+               rpm-build \
+               scrub \
+               sed \
+               systemd-rpm-macros && \
+    nosync dnf autoremove -y && \
+    nosync dnf clean all -y
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+RUN nosync dnf install -y \
+               mingw32-curl \
+               mingw32-dlfcn \
+               mingw32-gcc \
+               mingw32-gettext \
+               mingw32-glib2 \
+               mingw32-gnutls \
+               mingw32-headers \
+               mingw32-libssh2 \
+               mingw32-libxml2 \
+               mingw32-pkg-config \
+               mingw32-portablexdr \
+               mingw32-readline && \
+    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/i686-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
+
+ENV ABI "i686-w64-mingw32"
+ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"

diff --git a/ci/containers/fedora-37-cross-mingw64.Dockerfile b/ci/containers/fedora-37-cross-mingw64.Dockerfile
new file mode 100644 (file)
index 0000000..c468dd7
--- /dev/null
+++ b/ci/containers/fedora-37-cross-mingw64.Dockerfile
@@ -0,0 +1,88 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM registry.fedoraproject.org/fedora:37
+
+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 \
+               augeas \
+               bash-completion \
+               ca-certificates \
+               ccache \
+               codespell \
+               cpp \
+               cppi \
+               diffutils \
+               dwarves \
+               ebtables \
+               firewalld-filesystem \
+               git \
+               glibc-langpack-en \
+               grep \
+               iproute \
+               iproute-tc \
+               iptables \
+               iscsi-initiator-utils \
+               kmod \
+               libxml2 \
+               libxslt \
+               lvm2 \
+               make \
+               meson \
+               nfs-utils \
+               ninja-build \
+               numad \
+               perl-base \
+               polkit \
+               python3 \
+               python3-docutils \
+               python3-flake8 \
+               qemu-img \
+               rpcgen \
+               rpm-build \
+               scrub \
+               sed \
+               systemd-rpm-macros && \
+    nosync dnf autoremove -y && \
+    nosync dnf clean all -y
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+RUN nosync dnf install -y \
+               mingw64-curl \
+               mingw64-dlfcn \
+               mingw64-gcc \
+               mingw64-gettext \
+               mingw64-glib2 \
+               mingw64-gnutls \
+               mingw64-headers \
+               mingw64-libssh2 \
+               mingw64-libxml2 \
+               mingw64-pkg-config \
+               mingw64-portablexdr \
+               mingw64-readline && \
+    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/x86_64-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
+
+ENV ABI "x86_64-w64-mingw32"
+ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"

diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile
new file mode 100644 (file)
index 0000000..17f586a
--- /dev/null
+++ b/ci/containers/fedora-37.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:37
+
+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 \
+               systemd-devel \
+               systemd-rpm-macros \
+               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 CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 0e2daebe9708c66441b5b60f375138b84c45a344..89c15fa28da0b2168c959a52721f21165381984d 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -193,52 +193,52 @@ x86_64-debian-sid-local-env:
     NAME: debian-sid
 
 
-x86_64-fedora-35-prebuilt-env:
+x86_64-fedora-36-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-35-container
+    - job: x86_64-fedora-36-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-35
+    NAME: fedora-36
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
-x86_64-fedora-35-local-env:
+x86_64-fedora-36-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.fedoraproject.org/fedora:35
-    NAME: fedora-35
+    IMAGE: registry.fedoraproject.org/fedora:36
+    NAME: fedora-36
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
 
-x86_64-fedora-36-prebuilt-env:
+x86_64-fedora-37-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-36-container
+    - job: x86_64-fedora-37-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-36
+    NAME: fedora-37
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
-x86_64-fedora-36-local-env:
+x86_64-fedora-37-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.fedoraproject.org/fedora:36
-    NAME: fedora-36
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37
   artifacts:
     expire_in: 1 day
     paths:
@@ -746,46 +746,46 @@ s390x-debian-sid-local-env:
     NAME: debian-sid
 
 
-mingw32-fedora-36-prebuilt-env:
+mingw32-fedora-37-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw32-fedora-36-container
+    - job: mingw32-fedora-37-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-36
+    NAME: fedora-37
 
-mingw32-fedora-36-local-env:
+mingw32-fedora-37-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw32
-    IMAGE: registry.fedoraproject.org/fedora:36
+    IMAGE: registry.fedoraproject.org/fedora:37
     JOB_OPTIONAL: 1
-    NAME: fedora-36
+    NAME: fedora-37
 
 
-mingw64-fedora-36-prebuilt-env:
+mingw64-fedora-37-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw64-fedora-36-container
+    - job: mingw64-fedora-37-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-36
+    NAME: fedora-37
 
-mingw64-fedora-36-local-env:
+mingw64-fedora-37-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw64
-    IMAGE: registry.fedoraproject.org/fedora:36
-    NAME: fedora-36
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37
 
 
 mingw32-fedora-rawhide-prebuilt-env:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 1b7f63955b62d90fe72d4b9461f834a7e6a30cde..fa426bd3a629db9a82f8b6ad680814c3d1e86d3d 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -56,18 +56,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-35-container:
+x86_64-fedora-36-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-35
+    NAME: fedora-36
 
 
-x86_64-fedora-36-container:
+x86_64-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-36
+    NAME: fedora-37
 
 
 x86_64-fedora-rawhide-container:
@@ -235,19 +235,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-36-container:
+mingw32-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-36-cross-mingw32
+    NAME: fedora-37-cross-mingw32
 
 
-mingw64-fedora-36-container:
+mingw64-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-36-cross-mingw64
+    NAME: fedora-37-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:

diff --git a/ci/integration.yml b/ci/integration.yml
index b79d2e0f40f390e8defc719605a03a2d5743e465..2bdda1d3c1e535126c0b0af80f6c63df3716219f 100644 (file)
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -81,121 +81,121 @@ centos-stream-9-tests-local-env:
       artifacts: true
 
 
-.fedora-35-tests:
+.fedora-36-tests:
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-35
+    DISTRO: fedora-36
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-35-tests-prebuilt-env:
+fedora-36-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-35-tests
+    - .fedora-36-tests
   needs:
-    - x86_64-fedora-35-prebuilt-env
+    - x86_64-fedora-36-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-35-tests-local-env:
+fedora-36-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-35-tests
+    - .fedora-36-tests
   needs:
-    - x86_64-fedora-35-local-env
+    - x86_64-fedora-36-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
 
 
-.fedora-36-tests:
+.fedora-37-tests:
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-36
+    DISTRO: fedora-37
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-36-tests-prebuilt-env:
+fedora-37-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-36-tests
+    - .fedora-37-tests
   needs:
-    - x86_64-fedora-36-prebuilt-env
+    - x86_64-fedora-37-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-36-tests-local-env:
+fedora-37-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-36-tests
+    - .fedora-37-tests
   needs:
-    - x86_64-fedora-36-local-env
+    - x86_64-fedora-37-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
 
 
-.fedora-36-upstream-qemu-tests:
+.fedora-37-upstream-qemu-tests:
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-36
+    DISTRO: fedora-37
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-36-upstream-qemu-tests-prebuilt-env:
+fedora-37-upstream-qemu-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-upstream-qemu-tests
   needs:
-    - x86_64-fedora-36-prebuilt-env
+    - x86_64-fedora-37-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-36-upstream-qemu-tests-local-env:
+fedora-37-upstream-qemu-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-upstream-qemu-tests
   needs:
-    - x86_64-fedora-36-local-env
+    - x86_64-fedora-37-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2aec92dd26a5ed6ca3cf279300795508a0494cec..2aa9ce99526372c5a93934b01fda7b0c9cb48f13 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -116,7 +116,7 @@ targets:
         containers: false
         builds: false
 
-  fedora-35:
+  fedora-36:
     jobs:
       - arch: x86_64
         artifacts:
@@ -124,7 +124,7 @@ targets:
           paths:
             - libvirt-rpms
 
-  fedora-36:
+  fedora-37:
     jobs:
       - arch: x86_64
         artifacts: