ci: refresh with latest lcitool manifest

Some distros are upgraded

 * Fedora 34 dropped, Fedora 36 added
 * Ubuntu 18.04 dropped, Ubuntu 22.04 added

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

ci/containers/centos-stream-8.Dockerfile

@@ -11,6 +11,7 @@ RUN dnf distro-sync -y && \
     dnf config-manager --set-enabled -y powertools && \
     dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
+    dnf install -y epel-next-release && \
     dnf install -y \
         audit-libs-devel \
         augeas \

ci/containers/debian-10.Dockerfile

@@ -47,7 +47,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 meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/fedora-36.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:34
+FROM registry.fedoraproject.org/fedora:36
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\

ci/containers/opensuse-leap-153.Dockerfile

@@ -42,7 +42,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 meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/ubuntu-2004.Dockerfile

@@ -46,7 +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 meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

ci/containers/ubuntu-2204.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/ubuntu:18.04
+FROM docker.io/library/ubuntu:22.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -32,11 +32,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libxml2-utils \
             locales \
             make \
+            meson \
             ninja-build \
-            pkgconf \
+            pkgconf && \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -46,8 +44,6 @@ 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 meson==0.56.0
-
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"

ci/gitlab.yml

@@ -5,258 +5,30 @@
 # https://gitlab.com/libvirt/libvirt-ci
 
 
-.container_job:
+# Variables that can be set to control the behaviour of
-  image: docker:stable
+# pipelines that are run
-  stage: containers
+#
-  needs: []
+#  - RUN_ALL_CONTAINERS - build all containers
-  services:
+#    even if they don't have any changes detected
-    - docker:dind
+#
-  before_script:
+# These can be set as git push options
-    - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
+#
-    - export COMMON_TAG="$CI_REGISTRY/virt-viewer/virt-viewer/ci-$NAME:latest"
+#  $ git push -o ci.variable=RUN_ALL_CONTAINERS=1
-    - docker info
+#
-    - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+# Aliases can be set for common usage
-  script:
+#
-    - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
+#  $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1"
-    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers
+#
-    - docker push "$TAG"
+# Allowing the less verbose invocation
-  after_script:
+#
-    - docker logout
+#  $ git push-all-ctr
+#
+# Pipeline variables can also be set in the repository
+# pipeline config globally, or set against scheduled pipelines
 
-
+include:
-.gitlab_native_build_job:
+  - local: '/ci/gitlab/container-templates.yml'
-  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+  - local: '/ci/gitlab/build-templates.yml'
-  stage: builds
+  - local: '/ci/gitlab/sanity-checks.yml'
-
+  - local: '/ci/gitlab/containers.yml'
-
+  - local: '/ci/gitlab/builds.yml'
-.gitlab_cross_build_job:
-  image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
-  stage: builds
-
-
-check-dco:
-  stage: sanity_checks
-  needs: []
-  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
-  script:
-    - /check-dco virt-viewer
-  except:
-    variables:
-      - $CI_PROJECT_NAMESPACE == 'virt-viewer'
-  variables:
-    GIT_DEPTH: 1000
-
-
-# Native container jobs
-
-x86_64-centos-stream-8-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: centos-stream-8
-
-
-x86_64-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-10
-
-
-x86_64-debian-sid-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-sid
-
-
-x86_64-fedora-34-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    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
-  variables:
-    NAME: fedora-rawhide
-
-
-x86_64-opensuse-leap-153-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: opensuse-leap-153
-
-
-x86_64-opensuse-tumbleweed-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: opensuse-tumbleweed
-
-
-x86_64-ubuntu-1804-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: ubuntu-1804
-
-
-x86_64-ubuntu-2004-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: ubuntu-2004
-
-
-
-# Cross container jobs
-
-mingw32-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-rawhide-cross-mingw32
-
-
-mingw64-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-rawhide-cross-mingw64
-
-
-# Native build jobs
-
-x86_64-centos-stream-8:
-  extends: .native_build_job
-  needs:
-    - x86_64-centos-stream-8-container
-  allow_failure: false
-  variables:
-    NAME: centos-stream-8
-    RPM: skip
-
-
-x86_64-debian-10:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-10-container
-  allow_failure: false
-  variables:
-    NAME: debian-10
-
-
-x86_64-debian-sid:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-sid-container
-  allow_failure: false
-  variables:
-    NAME: debian-sid
-
-
-x86_64-fedora-34:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-34-container
-  allow_failure: false
-  variables:
-    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:
-    - x86_64-fedora-rawhide-container
-  allow_failure: false
-  variables:
-    NAME: fedora-rawhide
-
-
-x86_64-opensuse-leap-153:
-  extends: .native_build_job
-  needs:
-    - x86_64-opensuse-leap-153-container
-  allow_failure: false
-  variables:
-    NAME: opensuse-leap-153
-    RPM: skip
-
-
-x86_64-opensuse-tumbleweed:
-  extends: .native_build_job
-  needs:
-    - x86_64-opensuse-tumbleweed-container
-  allow_failure: false
-  variables:
-    NAME: opensuse-tumbleweed
-    RPM: skip
-
-
-x86_64-ubuntu-1804:
-  extends: .native_build_job
-  needs:
-    - x86_64-ubuntu-1804-container
-  allow_failure: false
-  variables:
-    NAME: ubuntu-1804
-
-
-x86_64-ubuntu-2004:
-  extends: .native_build_job
-  needs:
-    - x86_64-ubuntu-2004-container
-  allow_failure: false
-  variables:
-    NAME: ubuntu-2004
-
-
-
-# Cross build jobs
-
-mingw32-fedora-rawhide:
-  extends: .cross_build_job
-  needs:
-    - mingw32-fedora-rawhide-container
-  allow_failure: false
-  variables:
-    CROSS: mingw32
-    NAME: fedora-rawhide
-  artifacts:
-    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:
-    CROSS: mingw64
-    NAME: fedora-rawhide
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - data/virt-viewer-x64*.msi

ci/gitlab/build-templates.yml

@@ -0,0 +1,29 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+.gitlab_native_build_job:
+  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+  stage: builds
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - when: on_success
+
+
+.gitlab_cross_build_job:
+  image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
+  stage: builds
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - when: on_success

ci/gitlab/builds.yml

@@ -0,0 +1,143 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+# Native build jobs
+
+x86_64-centos-stream-8:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-centos-stream-8-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: centos-stream-8
+    RPM: skip
+
+
+x86_64-debian-10:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-debian-10-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: debian-10
+
+
+x86_64-debian-sid:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-debian-sid-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+
+
+x86_64-fedora-35:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-fedora-35-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
+x86_64-fedora-36:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-fedora-36-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-36
+
+
+x86_64-fedora-rawhide:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-fedora-rawhide-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide
+
+
+x86_64-opensuse-leap-153:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-opensuse-leap-153-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: opensuse-leap-153
+    RPM: skip
+
+
+x86_64-opensuse-tumbleweed:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-opensuse-tumbleweed-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: opensuse-tumbleweed
+    RPM: skip
+
+
+x86_64-ubuntu-2004:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-ubuntu-2004-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: ubuntu-2004
+
+
+x86_64-ubuntu-2204:
+  extends: .native_build_job
+  needs:
+    - job: x86_64-ubuntu-2204-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: ubuntu-2204
+
+
+
+# Cross build jobs
+
+mingw32-fedora-rawhide:
+  extends: .cross_build_job
+  needs:
+    - job: mingw32-fedora-rawhide-container
+      optional: true
+  allow_failure: false
+  variables:
+    CROSS: mingw32
+    NAME: fedora-rawhide
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - data/virt-viewer-x86*.msi
+
+
+mingw64-fedora-rawhide:
+  extends: .cross_build_job
+  needs:
+    - job: mingw64-fedora-rawhide-container
+      optional: true
+  allow_failure: false
+  variables:
+    CROSS: mingw64
+    NAME: fedora-rawhide
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - data/virt-viewer-x64*.msi

ci/gitlab/container-templates.yml

@@ -0,0 +1,57 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+# For upstream
+#
+#   - Push to default branch:
+#       -> rebuild if dockerfile changed, no cache
+#   - Otherwise
+#       -> rebuild if RUN_ALL_CONTAINERS=1, no cache,
+#          to pick up new published distro packages or
+#          recover from deleted tag
+#
+# For forks
+#   - Always rebuild, with cache
+#
+.container_job:
+  image: docker:stable
+  stage: containers
+  needs: []
+  services:
+    - docker:dind
+  before_script:
+    - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
+    - export COMMON_TAG="$CI_REGISTRY/virt-viewer/virt-viewer/ci-$NAME:latest"
+    - docker info
+    - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+  script:
+    - if test $CI_PROJECT_NAMESPACE = "virt-viewer";
+      then
+        docker build --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers ;
+      else
+        docker pull "$TAG" || docker pull "$COMMON_TAG" || true ;
+        docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers ;
+      fi
+    - docker push "$TAG"
+  after_script:
+    - docker logout
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$CI_PROJECT_NAMESPACE == "virt-viewer" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: on_success
+      changes:
+       - ci/gitlab/container-templates.yml
+       - ci/containers/$NAME.Dockerfile
+    - if: '$CI_PROJECT_NAMESPACE == "virt-viewer" && $RUN_ALL_CONTAINERS == "1"'
+      when: on_success
+    - if: '$CI_PROJECT_NAMESPACE == "virt-viewer"'
+      when: never
+    - if: '$JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - when: on_success

ci/gitlab/containers.yml

@@ -0,0 +1,94 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+# Native container jobs
+
+x86_64-centos-stream-8-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: centos-stream-8
+
+
+x86_64-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10
+
+
+x86_64-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+
+
+x86_64-fedora-35-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
+x86_64-fedora-36-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-36
+
+
+x86_64-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide
+
+
+x86_64-opensuse-leap-153-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: opensuse-leap-153
+
+
+x86_64-opensuse-tumbleweed-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: opensuse-tumbleweed
+
+
+x86_64-ubuntu-2004-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: ubuntu-2004
+
+
+x86_64-ubuntu-2204-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: ubuntu-2204
+
+
+
+# Cross container jobs
+
+mingw32-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide-cross-mingw32
+
+
+mingw64-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide-cross-mingw64

ci/gitlab/sanity-checks.yml

@@ -0,0 +1,18 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+check-dco:
+  stage: sanity_checks
+  needs: []
+  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
+  script:
+    - /check-dco virt-viewer
+  except:
+    variables:
+      - $CI_PROJECT_NAMESPACE == 'virt-viewer'
+  variables:
+    GIT_DEPTH: 1000

ci/manifest.yml

@@ -25,10 +25,10 @@ targets:
 
   debian-sid: x86_64
 
-  fedora-34: x86_64
-
   fedora-35: x86_64
 
+  fedora-36: x86_64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64
@@ -57,6 +57,6 @@ targets:
         variables:
           RPM: skip
 
-  ubuntu-1804: x86_64
-
   ubuntu-2004: x86_64
+
+  ubuntu-2204: x86_64