ci: refresh from lcitool manifest

This drops the CentOS 8 job and replaces Fedora 33 with 35.

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

8 files changed, 43 insertions, 102 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8db608c..ff7749e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,10 +48,10 @@ stages:
 include: '/ci/gitlab.yml'
 
 api-coverage:
-  image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
+  image: $CI_REGISTRY_IMAGE/ci-centos-stream-8:latest
   stage: sanity_checks
   needs:
-    - job: x86_64-centos-8-git
+    - job: x86_64-centos-stream-8-git
       artifacts: true
   before_script:
     - *git_build_vars
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
deleted file mode 100644
index 7971369..0000000
--- a/ci/containers/centos-8.Dockerfile
+++ /dev/null
@@ -1,59 +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 \
-        ca-certificates \
-        ccache \
-        cpp \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        gnutls-devel \
-        libnl3-devel \
-        libtirpc-devel \
-        libvirt-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        make \
-        ninja-build \
-        perl \
-        pkgconfig \
-        python3 \
-        python3-devel \
-        python3-docutils \
-        python3-lxml \
-        python3-pip \
-        python3-pytest \
-        python3-setuptools \
-        python3-wheel \
-        rpcgen \
-        rpm-build && \
-    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
-
-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"
diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index b16097f..83b3fe6 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -14,16 +14,32 @@ RUN dnf update -y && \
     dnf install -y \
         ca-certificates \
         ccache \
+        cpp \
         gcc \
+        gettext \
         git \
+        glib2-devel \
+        glibc-devel \
         glibc-langpack-en \
+        gnutls-devel \
+        libnl3-devel \
+        libtirpc-devel \
         libvirt-devel \
+        libxml2 \
+        libxml2-devel \
+        libxslt \
+        make \
+        meson \
+        ninja-build \
+        perl \
         pkgconfig \
         python3 \
         python3-devel \
+        python3-docutils \
         python3-lxml \
         python3-pytest \
         python3-setuptools \
+        rpcgen \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
@@ -33,5 +49,7 @@ RUN dnf update -y && \
     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/containers/fedora-33.Dockerfile b/ci/containers/fedora-35.Dockerfile
index 1425d18..ed2b501 100644
--- a/ci/containers/fedora-33.Dockerfile
+++ b/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\
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 3806117..44bad30 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -17,7 +17,7 @@ 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 \
         ca-certificates \
         ccache \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index c1936c9..df23812 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -6,7 +6,7 @@
 
 FROM registry.opensuse.org/opensuse/tumbleweed:latest
 
-RUN zypper update -y && \
+RUN zypper dist-upgrade -y && \
     zypper install -y \
            ca-certificates \
            ccache \
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 4f9b02d..6556b0a 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -10,8 +10,7 @@
   stage: containers
   needs: []
   services:
-    - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master
-      alias: docker
+    - docker:dind
   before_script:
     - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
     - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-python/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,18 +70,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-33-container:
+x86_64-fedora-34-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-33
+    NAME: fedora-34
 
 
-x86_64-fedora-34-container:
+x86_64-fedora-35-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-34
+    NAME: fedora-35
 
 
 x86_64-fedora-rawhide-container:
@@ -129,36 +121,28 @@ x86_64-ubuntu-2004-container:
 
 # Native build jobs
 
-x86_64-centos-8:
+x86_64-centos-stream-8:
   extends: .native_build_job
   needs:
-    - x86_64-centos-8-container
+    - x86_64-centos-stream-8-container
   allow_failure: false
   variables:
-    NAME: centos-8
+    NAME: centos-stream-8
 
 
-x86_64-centos-8-git:
+x86_64-centos-stream-8-git:
   extends: .native_git_build_job
   needs:
-    - x86_64-centos-8-container
+    - x86_64-centos-stream-8-container
   allow_failure: false
   variables:
-    NAME: centos-8
+    NAME: centos-stream-8
   artifacts:
     expire_in: 2 days
     paths:
       - scratch
       - build
 
-x86_64-centos-stream-8:
-  extends: .native_build_job
-  needs:
-    - x86_64-centos-stream-8-container
-  allow_failure: false
-  variables:
-    NAME: centos-stream-8
-
 
 x86_64-debian-10:
   extends: .native_build_job
@@ -178,22 +162,22 @@ x86_64-debian-sid:
     NAME: debian-sid
 
 
-x86_64-fedora-33:
+x86_64-fedora-34:
   extends: .native_build_job
   needs:
-    - x86_64-fedora-33-container
+    - x86_64-fedora-34-container
   allow_failure: false
   variables:
-    NAME: fedora-33
+    NAME: fedora-34
 
 
-x86_64-fedora-34:
+x86_64-fedora-35:
   extends: .native_build_job
   needs:
-    - x86_64-fedora-34-container
+    - x86_64-fedora-35-container
   allow_failure: false
   variables:
-    NAME: fedora-34
+    NAME: fedora-35
 
 
 x86_64-fedora-rawhide:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 4cee473..5b008b6 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -8,7 +8,7 @@ gitlab:
 
 targets:
 
-  centos-8:
+  centos-stream-8:
     projects:
       - libvirt-python
       - libvirt+minimal
@@ -25,16 +25,14 @@ targets:
             - scratch
             - build
 
-  centos-stream-8: x86_64
-
   debian-10: x86_64
 
   debian-sid: x86_64
 
-  fedora-33: x86_64
-
   fedora-34: x86_64
 
+  fedora-35: x86_64
+
   fedora-rawhide: x86_64
 
   opensuse-leap-152: