ci: refresh with latest 'lcitool manifest'

* Switch to using libvirt+minimal instead of libvirt project,
   for shorter build times
 * Actually do a git build job in CentOS Stream & AlmaLinux
 * Drop AlmaLinux 8
 * Update to latest Alpine versions

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

ci/buildenv/almalinux-8.sh

@@ -1,47 +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 'dnf-command(config-manager)' -y
-    dnf config-manager --set-enabled -y powertools
-    dnf install -y centos-release-advanced-virtualization
-    dnf install -y epel-release
-    dnf install -y \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        gtk-vnc2-devel \
-        gtk3-devel \
-        icoutils \
-        libtool \
-        libvirt-devel \
-        libvirt-gobject-devel \
-        libxml2 \
-        libxml2-devel \
-        make \
-        meson \
-        ninja-build \
-        pkgconfig \
-        rpm-build \
-        spice-gtk3-devel \
-        vte291-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/gcc
-}
-
-export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
-export LANG="en_US.UTF-8"
-export MAKE="/usr/bin/make"
-export NINJA="/usr/bin/ninja"

ci/buildenv/almalinux-9.sh

@@ -10,20 +10,11 @@ function install_buildenv() {
     dnf config-manager --set-enabled -y crb
     dnf install -y epel-release
     dnf install -y \
-        audit-libs-devel \
-        augeas \
         bash-completion \
         ca-certificates \
         ccache \
-        clang \
         cpp \
         cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
         gcc \
         gdk-pixbuf2-devel \
         gettext \
@@ -33,78 +24,38 @@ function install_buildenv() {
         glibc-langpack-en \
         gnutls-devel \
         gobject-introspection-devel \
-        grep \
         gtk-doc \
         gtk3-devel \
         icoutils \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
         libgcrypt-devel \
-        libiscsi-devel \
-        libnbd-devel \
         libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
         libtirpc-devel \
         libtool \
-        libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         pulseaudio-libs-devel \
         python3 \
         python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-pytest \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        readline-devel \
         rpm-build \
-        sanlock-devel \
-        sed \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
         vala \
-        vte291-devel \
+        vte291-devel
-        wireshark-devel \
-        yajl-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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
-    /usr/bin/pip3 install black
 }
+function export_buildenv() {
 
 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"
+}

ci/buildenv/alpine-319.sh

@@ -36,8 +36,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/alpine-320.sh

@@ -36,8 +36,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/alpine-edge.sh

@@ -36,8 +36,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/centos-stream-9.sh

@@ -11,20 +11,11 @@ function install_buildenv() {
     dnf install -y epel-release
     dnf install -y epel-next-release
     dnf install -y \
-        audit-libs-devel \
-        augeas \
         bash-completion \
         ca-certificates \
         ccache \
-        clang \
         cpp \
         cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
         gcc \
         gdk-pixbuf2-devel \
         gettext \
@@ -34,78 +25,38 @@ function install_buildenv() {
         glibc-langpack-en \
         gnutls-devel \
         gobject-introspection-devel \
-        grep \
         gtk-doc \
         gtk3-devel \
         icoutils \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
         libgcrypt-devel \
-        libiscsi-devel \
-        libnbd-devel \
         libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
         libtirpc-devel \
         libtool \
-        libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         pulseaudio-libs-devel \
         python3 \
         python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-pytest \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        readline-devel \
         rpm-build \
-        sanlock-devel \
-        sed \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
         vala \
-        vte291-devel \
+        vte291-devel
-        wireshark-devel \
-        yajl-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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
-    /usr/bin/pip3 install black
 }
+function export_buildenv() {
 
 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"
+}

ci/buildenv/debian-11.sh

@@ -42,8 +42,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/debian-12.sh

@@ -42,8 +42,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/debian-sid.sh

@@ -42,8 +42,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/fedora-39.sh

@@ -39,8 +39,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/fedora-40.sh

@@ -39,8 +39,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/fedora-rawhide-cross-mingw32.sh

@@ -41,6 +41,7 @@ function install_buildenv() {
     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
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
@@ -49,3 +50,4 @@ export NINJA="/usr/bin/ninja"
 
 export ABI="i686-w64-mingw32"
 export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
+}

ci/buildenv/fedora-rawhide-cross-mingw64.sh

@@ -41,6 +41,7 @@ function install_buildenv() {
     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
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
@@ -49,3 +50,4 @@ export NINJA="/usr/bin/ninja"
 
 export ABI="x86_64-w64-mingw32"
 export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw64.meson"
+}

ci/buildenv/fedora-rawhide.sh

@@ -40,8 +40,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/opensuse-leap-15.sh

@@ -6,6 +6,7 @@
 
 function install_buildenv() {
     zypper update -y
+    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo
     zypper install -y \
            bash-completion-devel \
            ca-certificates \
@@ -39,8 +40,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/opensuse-tumbleweed.sh

@@ -39,8 +39,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/ubuntu-2204.sh

@@ -41,8 +41,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/buildenv/ubuntu-2404.sh

@@ -41,8 +41,10 @@ function install_buildenv() {
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 }
+function export_buildenv() {
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 export LANG="en_US.UTF-8"
 export MAKE="/usr/bin/make"
 export NINJA="/usr/bin/ninja"
+}

ci/containers/almalinux-8.Dockerfile

@@ -1,49 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/almalinux:8
-
-RUN dnf update -y && \
-    dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
-    dnf install -y epel-release && \
-    dnf install -y \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        gtk-vnc2-devel \
-        gtk3-devel \
-        icoutils \
-        libtool \
-        libvirt-devel \
-        libvirt-gobject-devel \
-        libxml2 \
-        libxml2-devel \
-        make \
-        meson \
-        ninja-build \
-        pkgconfig \
-        rpm-build \
-        spice-gtk3-devel \
-        vte291-devel && \
-    dnf autoremove -y && \
-    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/gcc
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"

ci/containers/almalinux-9.Dockerfile

@@ -11,20 +11,11 @@ RUN dnf update -y && \
     dnf config-manager --set-enabled -y crb && \
     dnf install -y epel-release && \
     dnf install -y \
-        audit-libs-devel \
-        augeas \
         bash-completion \
         ca-certificates \
         ccache \
-        clang \
         cpp \
         cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
         gcc \
         gdk-pixbuf2-devel \
         gettext \
@@ -34,78 +25,35 @@ RUN dnf update -y && \
         glibc-langpack-en \
         gnutls-devel \
         gobject-introspection-devel \
-        grep \
         gtk-doc \
         gtk3-devel \
         icoutils \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
         libgcrypt-devel \
-        libiscsi-devel \
-        libnbd-devel \
         libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
         libtirpc-devel \
         libtool \
-        libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         pulseaudio-libs-devel \
         python3 \
         python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-pytest \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        readline-devel \
         rpm-build \
-        sanlock-devel \
-        sed \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
         vala \
-        vte291-devel \
+        vte291-devel && \
-        wireshark-devel \
-        yajl-devel && \
     dnf autoremove -y && \
     dnf clean all -y && \
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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
 
-RUN /usr/bin/pip3 install black
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/alpine-320.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.20
 
 RUN apk update && \
     apk upgrade && \

ci/containers/centos-stream-9.Dockerfile

@@ -12,20 +12,11 @@ RUN dnf distro-sync -y && \
     dnf install -y epel-release && \
     dnf install -y epel-next-release && \
     dnf install -y \
-        audit-libs-devel \
-        augeas \
         bash-completion \
         ca-certificates \
         ccache \
-        clang \
         cpp \
         cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
         gcc \
         gdk-pixbuf2-devel \
         gettext \
@@ -35,78 +26,35 @@ RUN dnf distro-sync -y && \
         glibc-langpack-en \
         gnutls-devel \
         gobject-introspection-devel \
-        grep \
         gtk-doc \
         gtk3-devel \
         icoutils \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
         libgcrypt-devel \
-        libiscsi-devel \
-        libnbd-devel \
         libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
         libtirpc-devel \
         libtool \
-        libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         pulseaudio-libs-devel \
         python3 \
         python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-pytest \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        readline-devel \
         rpm-build \
-        sanlock-devel \
-        sed \
-        systemd-devel \
-        systemd-rpm-macros \
-        systemtap-sdt-devel \
         vala \
-        vte291-devel \
+        vte291-devel && \
-        wireshark-devel \
-        yajl-devel && \
     dnf autoremove -y && \
     dnf clean all -y && \
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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
 
-RUN /usr/bin/pip3 install black
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/opensuse-leap-15.Dockerfile

@@ -4,9 +4,10 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.opensuse.org/opensuse/leap:15.5
+FROM registry.opensuse.org/opensuse/leap:15.6
 
 RUN zypper update -y && \
+    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \
     zypper install -y \
            bash-completion-devel \
            ca-certificates \

ci/gitlab/build-templates.yml

@@ -32,6 +32,7 @@
       then
         source ci/buildenv/$NAME.sh ;
         install_buildenv ;
+        export_buildenv ;
       fi
     - cat /packages.txt
   variables:
@@ -168,6 +169,7 @@
       then
         source ci/buildenv/$NAME-cross-$CROSS.sh ;
         install_buildenv ;
+        export_buildenv ;
       fi
     - cat /packages.txt
   variables:

ci/gitlab/builds.yml

@@ -7,20 +7,8 @@
 
 # Native build jobs
 
-x86_64-almalinux-8:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-almalinux-8-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: almalinux-8
-    RPM: skip
-    TARGET_BASE_IMAGE: docker.io/library/almalinux:8
-
-
 x86_64-almalinux-9:
-  extends: .native_build_job
+  extends: .native_git_build_job
   needs:
     - job: x86_64-almalinux-9-container
       optional: true
@@ -31,17 +19,6 @@ x86_64-almalinux-9:
     TARGET_BASE_IMAGE: docker.io/library/almalinux:9
 
 
-x86_64-alpine-318:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-alpine-318-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: alpine-318
-    TARGET_BASE_IMAGE: docker.io/library/alpine:3.18
-
-
 x86_64-alpine-319:
   extends: .native_build_job
   needs:
@@ -53,6 +30,17 @@ x86_64-alpine-319:
     TARGET_BASE_IMAGE: docker.io/library/alpine:3.19
 
 
+x86_64-alpine-320:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-alpine-320-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: alpine-320
+    TARGET_BASE_IMAGE: docker.io/library/alpine:3.20
+
+
 x86_64-alpine-edge:
   extends: .native_build_job
   needs:
@@ -65,7 +53,7 @@ x86_64-alpine-edge:
 
 
 x86_64-centos-stream-9:
-  extends: .native_build_job
+  extends: .native_git_build_job
   needs:
     - job: x86_64-centos-stream-9-container
       optional: true
@@ -151,7 +139,7 @@ x86_64-opensuse-leap-15:
   variables:
     NAME: opensuse-leap-15
     RPM: skip
-    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5
+    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.6
 
 
 x86_64-opensuse-tumbleweed:

ci/gitlab/containers.yml

@@ -7,13 +7,6 @@
 
 # Native container jobs
 
-x86_64-almalinux-8-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: almalinux-8
-
-
 x86_64-almalinux-9-container:
   extends: .container_job
   allow_failure: false
@@ -21,13 +14,6 @@ x86_64-almalinux-9-container:
     NAME: almalinux-9
 
 
-x86_64-alpine-318-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: alpine-318
-
-
 x86_64-alpine-319-container:
   extends: .container_job
   allow_failure: false
@@ -35,6 +21,13 @@ x86_64-alpine-319-container:
     NAME: alpine-319
 
 
+x86_64-alpine-320-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: alpine-320
+
+
 x86_64-alpine-edge-container:
   extends: .container_job
   allow_failure: true

ci/manifest.yml

@@ -9,39 +9,35 @@ gitlab:
   project: virt-viewer
 
 targets:
-  almalinux-8:
-    jobs:
-      - arch: x86_64
-        variables:
-          RPM: skip
-
   almalinux-9:
     projects:
       - virt-viewer
-      - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt.yml
+      - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt+minimal.yml
       - https://gitlab.com/libvirt/libvirt-glib/-/raw/master/ci/lcitool/projects/libvirt-glib.yml
       - https://gitlab.gnome.org/GNOME/gtk-vnc/-/raw/master/ci/lcitool/projects/gtk-vnc.yml
 
     jobs:
       - arch: x86_64
+        template: .native_git_build_job
         variables:
           RPM: skip
 
-  alpine-318: x86_64
-
   alpine-319: x86_64
 
+  alpine-320: x86_64
+
   alpine-edge: x86_64
 
   centos-stream-9:
     projects:
       - virt-viewer
-      - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt.yml
+      - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt+minimal.yml
       - https://gitlab.com/libvirt/libvirt-glib/-/raw/master/ci/lcitool/projects/libvirt-glib.yml
       - https://gitlab.gnome.org/GNOME/gtk-vnc/-/raw/master/ci/lcitool/projects/gtk-vnc.yml
 
     jobs:
       - arch: x86_64
+        template: .native_git_build_job
         variables:
           RPM: skip