ci: refresh from lcitool manifest

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

.gitlab-ci.yml

@@ -70,9 +70,9 @@ include: '/ci/gitlab.yml'
 
 codestyle:
   stage: sanity_checks
-  image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
+  image: $CI_REGISTRY_IMAGE/ci-centos-stream-8:latest
   needs:
-    - x86_64-centos-8-container
+    - x86_64-centos-stream-8-container
   before_script:
     - *script_variables
   script:

ci/containers/centos-8.Dockerfile

@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/centos: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 \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        cpp \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gdk-pixbuf2-devel \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        gobject-introspection-devel \
-        grep \
-        gtk-doc \
-        gtk3-devel \
-        icoutils \
-        intltool \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libgcrypt-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libtool \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        perl \
-        pkgconfig \
-        polkit \
-        pulseaudio-libs-devel \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        spice-gtk3-devel \
-        systemtap-sdt-devel \
-        vala \
-        vte291-devel \
-        wireshark-devel \
-        xfsprogs-devel \
-        yajl-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/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-RUN pip3 install \
-         meson==0.56.0
-
-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"

ci/containers/centos-stream-8.Dockerfile

@@ -6,45 +6,105 @@
 
 FROM quay.io/centos/centos:stream8
 
-RUN dnf update -y && \
+RUN dnf distro-sync -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 \
+        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 \
         git \
         glib2-devel \
+        glibc-devel \
         glibc-langpack-en \
+        glusterfs-api-devel \
+        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 \
+        libnl3-devel \
+        libpcap-devel \
+        libpciaccess-devel \
+        librbd-devel \
+        libselinux-devel \
+        libssh-devel \
+        libssh2-devel \
+        libtirpc-devel \
         libtool \
-        libvirt-devel \
+        libwsman-devel \
         libxml2 \
         libxml2-devel \
+        libxslt \
+        lvm2 \
         make \
+        meson \
+        netcf-devel \
+        nfs-utils \
         ninja-build \
+        numactl-devel \
+        numad \
+        parted-devel \
+        perl \
         pkgconfig \
-        python3-pip \
+        polkit \
-        python3-setuptools \
+        pulseaudio-libs-devel \
-        python3-wheel \
+        python3 \
+        python3-docutils \
+        python3-flake8 \
+        qemu-img \
+        readline-devel \
+        rpcgen \
         rpm-build \
+        sanlock-devel \
+        scrub \
+        sed \
         spice-gtk3-devel \
-        vte291-devel && \
+        systemd-devel \
+        systemtap-sdt-devel \
+        vala \
+        vte291-devel \
+        wireshark-devel \
+        yajl-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/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
-         meson==0.56.0
-
 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"

ci/containers/debian-10.Dockerfile

@@ -46,8 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
+RUN pip3 install meson==0.56.0
-         meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/fedora-34.Dockerfile

@@ -21,6 +21,7 @@ exec "$@"' > /usr/bin/nosync && \
         bash-completion \
         ca-certificates \
         ccache \
+        cppi \
         gcc \
         git \
         glib2-devel \

ci/containers/fedora-35.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:35
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\
@@ -21,6 +21,7 @@ exec "$@"' > /usr/bin/nosync && \
         bash-completion \
         ca-certificates \
         ccache \
+        cppi \
         gcc \
         git \
         glib2-devel \

ci/containers/fedora-rawhide-cross-mingw32.Dockerfile

@@ -17,11 +17,12 @@ else\n\
 fi\n\
 exec "$@"' > /usr/bin/nosync && \
     chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
+    nosync dnf distro-sync -y && \
     nosync dnf install -y \
         bash-completion \
         ca-certificates \
         ccache \
+        cppi \
         git \
         glibc-langpack-en \
         gtk-vnc2-devel \
@@ -33,11 +34,12 @@ exec "$@"' > /usr/bin/nosync && \
         ninja-build \
         rpm-build && \
     nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
+    nosync dnf clean all -y
-    rpm -qa | sort > /packages.txt && \
+
-    mkdir -p /usr/libexec/ccache-wrappers && \
+ENV LANG "en_US.UTF-8"
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+ENV MAKE "/usr/bin/make"
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
+ENV NINJA "/usr/bin/ninja"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 RUN nosync dnf install -y \
         mingw32-gcc \
@@ -51,12 +53,11 @@ RUN nosync dnf install -y \
         mingw32-pkg-config \
         mingw32-rest \
         mingw32-spice-gtk3 && \
-    nosync dnf clean all -y
+    nosync dnf clean all -y && \
-
+    rpm -qa | sort > /packages.txt && \
-ENV LANG "en_US.UTF-8"
+    mkdir -p /usr/libexec/ccache-wrappers && \
-ENV MAKE "/usr/bin/make"
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
-ENV NINJA "/usr/bin/ninja"
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "i686-w64-mingw32"
 ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"

ci/containers/fedora-rawhide-cross-mingw64.Dockerfile

@@ -17,11 +17,12 @@ else\n\
 fi\n\
 exec "$@"' > /usr/bin/nosync && \
     chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
+    nosync dnf distro-sync -y && \
     nosync dnf install -y \
         bash-completion \
         ca-certificates \
         ccache \
+        cppi \
         git \
         glibc-langpack-en \
         gtk-vnc2-devel \
@@ -33,11 +34,12 @@ exec "$@"' > /usr/bin/nosync && \
         ninja-build \
         rpm-build && \
     nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
+    nosync dnf clean all -y
-    rpm -qa | sort > /packages.txt && \
+
-    mkdir -p /usr/libexec/ccache-wrappers && \
+ENV LANG "en_US.UTF-8"
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
+ENV MAKE "/usr/bin/make"
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
+ENV NINJA "/usr/bin/ninja"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 RUN nosync dnf install -y \
         mingw64-gcc \
@@ -51,12 +53,11 @@ RUN nosync dnf install -y \
         mingw64-pkg-config \
         mingw64-rest \
         mingw64-spice-gtk3 && \
-    nosync dnf clean all -y
+    nosync dnf clean all -y && \
-
+    rpm -qa | sort > /packages.txt && \
-ENV LANG "en_US.UTF-8"
+    mkdir -p /usr/libexec/ccache-wrappers && \
-ENV MAKE "/usr/bin/make"
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
-ENV NINJA "/usr/bin/ninja"
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "x86_64-w64-mingw32"
 ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"

ci/containers/fedora-rawhide.Dockerfile

@@ -17,11 +17,12 @@ else\n\
 fi\n\
 exec "$@"' > /usr/bin/nosync && \
     chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
+    nosync dnf distro-sync -y && \
     nosync dnf install -y \
         bash-completion \
         ca-certificates \
         ccache \
+        cppi \
         gcc \
         git \
         glib2-devel \

ci/containers/opensuse-leap-153.Dockerfile

@@ -4,13 +4,14 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.opensuse.org/opensuse/leap:15.2
+FROM registry.opensuse.org/opensuse/leap:15.3
 
 RUN zypper update -y && \
     zypper install -y \
            bash-completion \
            ca-certificates \
            ccache \
+           cppi \
            gcc \
            git \
            glib2-devel \
@@ -40,8 +41,7 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
+RUN pip3 install meson==0.56.0
-         meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/opensuse-tumbleweed.Dockerfile

@@ -6,11 +6,12 @@
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 
-RUN zypper update -y && \
+RUN zypper dist-upgrade -y && \
     zypper install -y \
            bash-completion \
            ca-certificates \
            ccache \
+           cppi \
            gcc \
            git \
            glib2-devel \

ci/containers/ubuntu-1804.Dockerfile

@@ -45,8 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
+RUN pip3 install meson==0.56.0
-         meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/ubuntu-2004.Dockerfile

@@ -45,8 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN pip3 install \
+RUN pip3 install meson==0.56.0
-         meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/gitlab.yml

@@ -10,8 +10,7 @@
   stage: containers
   needs: []
   services:
-    - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master
+    - docker:dind
-      alias: docker
   before_script:
     - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
     - export COMMON_TAG="$CI_REGISTRY/virt-viewer/virt-viewer/ci-$NAME:latest"
@@ -50,13 +49,6 @@ check-dco:
 
 # Native container jobs
 
-x86_64-centos-8-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: centos-8
-
-
 x86_64-centos-stream-8-container:
   extends: .container_job
   allow_failure: false
@@ -78,13 +70,6 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-33-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-33
-
-
 x86_64-fedora-34-container:
   extends: .container_job
   allow_failure: false
@@ -92,6 +77,13 @@ x86_64-fedora-34-container:
     NAME: fedora-34
 
 
+x86_64-fedora-35-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
 x86_64-fedora-rawhide-container:
   extends: .container_job
   allow_failure: false
@@ -99,11 +91,11 @@ x86_64-fedora-rawhide-container:
     NAME: fedora-rawhide
 
 
-x86_64-opensuse-leap-152-container:
+x86_64-opensuse-leap-153-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: opensuse-leap-152
+    NAME: opensuse-leap-153
 
 
 x86_64-opensuse-tumbleweed-container:
@@ -146,16 +138,6 @@ mingw64-fedora-rawhide-container:
 
 # Native build jobs
 
-x86_64-centos-8:
-  extends: .native_build_job
-  needs:
-    - x86_64-centos-8-container
-  allow_failure: false
-  variables:
-    NAME: centos-8
-    RPM: skip
-
-
 x86_64-centos-stream-8:
   extends: .native_build_job
   needs:
@@ -184,15 +166,6 @@ x86_64-debian-sid:
     NAME: debian-sid
 
 
-x86_64-fedora-33:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-33-container
-  allow_failure: false
-  variables:
-    NAME: fedora-33
-
-
 x86_64-fedora-34:
   extends: .native_build_job
   needs:
@@ -202,6 +175,15 @@ x86_64-fedora-34:
     NAME: fedora-34
 
 
+x86_64-fedora-35:
+  extends: .native_build_job
+  needs:
+    - x86_64-fedora-35-container
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
 x86_64-fedora-rawhide:
   extends: .native_build_job
   needs:
@@ -211,13 +193,13 @@ x86_64-fedora-rawhide:
     NAME: fedora-rawhide
 
 
-x86_64-opensuse-leap-152:
+x86_64-opensuse-leap-153:
   extends: .native_build_job
   needs:
-    - x86_64-opensuse-leap-152-container
+    - x86_64-opensuse-leap-153-container
   allow_failure: false
   variables:
-    NAME: opensuse-leap-152
+    NAME: opensuse-leap-153
     RPM: skip
 
 
@@ -258,22 +240,23 @@ mingw32-fedora-rawhide:
     - mingw32-fedora-rawhide-container
   allow_failure: false
   variables:
-    NAME: fedora-rawhide
     CROSS: mingw32
+    NAME: fedora-rawhide
   artifacts:
-    expire_in: 30 days
+    expire_in: 2 days
     paths:
       - data/virt-viewer-x86*.msi
 
+
 mingw64-fedora-rawhide:
   extends: .cross_build_job
   needs:
     - mingw64-fedora-rawhide-container
   allow_failure: false
   variables:
-    NAME: fedora-rawhide
     CROSS: mingw64
+    NAME: fedora-rawhide
   artifacts:
-    expire_in: 30 days
+    expire_in: 2 days
     paths:
-      - data/virt-viewer-x64*.msi
+      - data/virt-viewer-x64*.msi

ci/manifest.yml

@@ -9,7 +9,7 @@ gitlab:
   project: virt-viewer
 
 targets:
-  centos-8:
+  centos-stream-8:
     projects:
       - virt-viewer
       - libvirt
@@ -21,20 +21,14 @@ targets:
         variables:
           RPM: skip
 
-  centos-stream-8:
-    jobs:
-      - arch: x86_64
-        variables:
-          RPM: skip
-
   debian-10: x86_64
 
   debian-sid: x86_64
 
-  fedora-33: x86_64
-
   fedora-34: x86_64
 
+  fedora-35: x86_64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64
@@ -51,7 +45,7 @@ targets:
           paths:
             - data/virt-viewer-x64*.msi
 
-  opensuse-leap-152:
+  opensuse-leap-153:
     jobs:
       - arch: x86_64
         variables:

meson.build

@@ -8,7 +8,7 @@ project(
     'c_std=gnu99',
     'warning_level=1',
   ],
-  meson_version: '>= 0.54.0'
+  meson_version: '>= 0.56.0'
 )
 
 pod2man = find_program('pod2man')