]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: re-generate containers/gitlab config from manifest
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 9 Sep 2021 13:49:01 +0000 (14:49 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Fri, 10 Sep 2021 12:36:09 +0000 (13:36 +0100)
This uses the command "lcitool manifest ci/manifest.yml" to re-generate
all existing dockerfiles and gitlab CI config.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
36 files changed:
.gitlab-ci.yml
ci/cirrus/freebsd-12.vars
ci/cirrus/freebsd-13.vars
ci/cirrus/freebsd-current.vars
ci/cirrus/macos-11.vars
ci/containers/centos-8.Dockerfile
ci/containers/centos-stream-8.Dockerfile
ci/containers/debian-10-cross-aarch64.Dockerfile
ci/containers/debian-10-cross-armv6l.Dockerfile
ci/containers/debian-10-cross-armv7l.Dockerfile
ci/containers/debian-10-cross-i686.Dockerfile
ci/containers/debian-10-cross-mips.Dockerfile
ci/containers/debian-10-cross-mips64el.Dockerfile
ci/containers/debian-10-cross-mipsel.Dockerfile
ci/containers/debian-10-cross-ppc64le.Dockerfile
ci/containers/debian-10-cross-s390x.Dockerfile
ci/containers/debian-10.Dockerfile
ci/containers/debian-sid-cross-aarch64.Dockerfile
ci/containers/debian-sid-cross-armv6l.Dockerfile
ci/containers/debian-sid-cross-armv7l.Dockerfile
ci/containers/debian-sid-cross-i686.Dockerfile
ci/containers/debian-sid-cross-mips64el.Dockerfile
ci/containers/debian-sid-cross-mipsel.Dockerfile
ci/containers/debian-sid-cross-ppc64le.Dockerfile
ci/containers/debian-sid-cross-s390x.Dockerfile
ci/containers/debian-sid.Dockerfile
ci/containers/fedora-33.Dockerfile
ci/containers/fedora-34.Dockerfile
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
ci/containers/fedora-rawhide.Dockerfile
ci/containers/opensuse-leap-152.Dockerfile
ci/containers/opensuse-tumbleweed.Dockerfile
ci/containers/ubuntu-1804.Dockerfile
ci/containers/ubuntu-2004.Dockerfile
ci/gitlab.yml [new file with mode: 0644]

index 567ff91c824fd9f4bdfb0fef062946824d491dce..b396a1511d40bc80a3e8ca21f74cf3b42e6e9ead 100644 (file)
@@ -14,42 +14,10 @@ stages:
   export VIR_TEST_VERBOSE="1"
   export VIR_TEST_DEBUG="1"
 
-# Common templates
-
-.container_job:
-  image: docker:stable
-  stage: containers
-  needs: []
-  services:
-    - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master
-      alias: docker
-  rules:
-    - if: "$TEMPORARILY_DISABLED"
-      allow_failure: true
-    - when: on_success
-  before_script:
-    - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
-    - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest"
-    - docker info
-    - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-  script:
-    - 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
-    - docker push "$TAG"
-  after_script:
-    - docker logout
-
-# We build many containers which can be useful to debug problems but are not
-# needed for the pipeline itself to complete: those sometimes fail, and when
-# that happens it's mostly because of temporary issues with Debian sid. We
-# don't want those failures to affect the overall pipeline status
-.container_optional_job:
-  extends: .container_job
-  allow_failure: true
+include: '/ci/gitlab.yml'
 
 .native_build_job:
-  stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+  extends: .gitlab_native_build_job
   rules:
     - if: "$TEMPORARILY_DISABLED"
       allow_failure: true
@@ -71,52 +39,8 @@ stages:
         meson test -C build --no-suite syntax-check --print-errorlogs;
       fi
 
-
-# Jobs that we delegate to Cirrus CI because they require an operating
-# system other than Linux. These jobs will only run if the required
-# setup has been performed on the GitLab account (see ci/README.rst).
-#
-# The Cirrus CI configuration is generated by replacing target-specific
-# variables in a generic template: some of these variables are provided
-# when the GitLab CI job is defined, others are taken from a shell
-# snippet generated using lcitool.
-#
-# Note that the $PATH environment variable has to be treated with
-# special care, because we can't just override it at the GitLab CI job
-# definition level or we risk breaking it completely.
-.cirrus_build_job:
-  stage: builds
-  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
-  needs: []
-  script:
-    - source ci/cirrus/$NAME.vars
-    - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g"
-          -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g"
-          -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g"
-          -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g"
-          -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g"
-          -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g"
-          -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g"
-          -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g"
-          -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g"
-          -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g"
-          -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g"
-          -e "s|[@]PKGS@|$PKGS|g"
-          -e "s|[@]MAKE@|$MAKE|g"
-          -e "s|[@]PYTHON@|$PYTHON|g"
-          -e "s|[@]PIP3@|$PIP3|g"
-          -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
-      <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
-    - cat ci/cirrus/$NAME.yml
-    - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
-  rules:
-    - if: "$TEMPORARILY_DISABLED"
-      allow_failure: true
-    - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
-
 .cross_build_job:
-  stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
+  extends: .gitlab_cross_build_job
   cache:
     paths:
       - ccache/
@@ -133,411 +57,6 @@ stages:
     - if test "$CROSS" = "i686" ; then meson test -C build --no-suite syntax-check --print-errorlogs ; fi
 
 
-# Native container build jobs
-
-x64-centos-8-container:
-  extends: .container_job
-  variables:
-    NAME: centos-8
-
-x64-centos-stream-8-container:
-  extends: .container_job
-  variables:
-    NAME: centos-stream-8
-
-x64-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10
-
-x64-debian-sid-container:
-  extends: .container_job
-  variables:
-    NAME: debian-sid
-
-x64-fedora-33-container:
-  extends: .container_job
-  variables:
-    NAME: fedora-33
-
-x64-fedora-34-container:
-  extends: .container_job
-  variables:
-    NAME: fedora-34
-
-x64-fedora-rawhide-container:
-  extends: .container_optional_job
-  variables:
-    NAME: fedora-rawhide
-
-x64-opensuse-leap-152-container:
-  extends: .container_job
-  variables:
-    NAME: opensuse-leap-152
-
-x64-opensuse-tumbleweed-container:
-  extends: .container_job
-  variables:
-    NAME: opensuse-tumbleweed
-
-x64-ubuntu-1804-container:
-  extends: .container_job
-  variables:
-    NAME: ubuntu-1804
-
-x64-ubuntu-2004-container:
-  extends: .container_job
-  variables:
-    NAME: ubuntu-2004
-
-
-# Cross-build containers build jobs
-
-aarch64-debian-10-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-10-cross-aarch64
-
-armv6l-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10-cross-armv6l
-
-armv7l-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10-cross-armv7l
-
-i686-debian-10-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-10-cross-i686
-
-mips-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10-cross-mips
-
-mips64el-debian-10-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-10-cross-mips64el
-
-mipsel-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10-cross-mipsel
-
-ppc64le-debian-10-container:
-  extends: .container_job
-  variables:
-    NAME: debian-10-cross-ppc64le
-
-s390x-debian-10-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-10-cross-s390x
-
-aarch64-debian-sid-container:
-  extends: .container_job
-  variables:
-    NAME: debian-sid-cross-aarch64
-
-armv6l-debian-sid-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-sid-cross-armv6l
-
-armv7l-debian-sid-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-sid-cross-armv7l
-
-i686-debian-sid-container:
-  extends: .container_job
-  variables:
-    NAME: debian-sid-cross-i686
-
-mips64el-debian-sid-container:
-  extends: .container_job
-  variables:
-    NAME: debian-sid-cross-mips64el
-
-mipsel-debian-sid-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-sid-cross-mipsel
-
-ppc64le-debian-sid-container:
-  extends: .container_optional_job
-  variables:
-    NAME: debian-sid-cross-ppc64le
-
-s390x-debian-sid-container:
-  extends: .container_job
-  variables:
-    NAME: debian-sid-cross-s390x
-
-mingw32-fedora-rawhide-container:
-  extends: .container_optional_job
-  variables:
-    NAME: fedora-rawhide-cross-mingw32
-
-mingw64-fedora-rawhide-container:
-  extends: .container_optional_job
-  variables:
-    NAME: fedora-rawhide-cross-mingw64
-
-
-# Native architecture build + test jobs
-
-x64-debian-10:
-  extends: .native_build_job
-  needs:
-    - x64-debian-10-container
-  variables:
-    NAME: debian-10
-
-x64-debian-10-clang:
-  extends: .native_build_job
-  needs:
-    - x64-debian-10-container
-  variables:
-    NAME: debian-10
-    CC: clang
-
-x64-debian-sid:
-  extends: .native_build_job
-  needs:
-    - x64-debian-sid-container
-  variables:
-    NAME: debian-sid
-
-x64-centos-8:
-  extends: .native_build_job
-  needs:
-    - x64-centos-8-container
-  variables:
-    NAME: centos-8
-    RPM: skip
-
-x64-centos-8-clang:
-  extends: .native_build_job
-  needs:
-    - x64-centos-8-container
-  variables:
-    NAME: centos-8
-    CC: clang
-    RPM: skip
-
-x64-centos-stream-8:
-  extends: .native_build_job
-  needs:
-    - x64-centos-stream-8-container
-  variables:
-    NAME: centos-stream-8
-    RPM: skip
-
-x64-fedora-33:
-  extends: .native_build_job
-  needs:
-    - x64-fedora-33-container
-  variables:
-    NAME: fedora-33
-
-x64-fedora-34:
-  extends: .native_build_job
-  needs:
-    - x64-fedora-34-container
-  variables:
-    NAME: fedora-34
-
-x64-fedora-rawhide:
-  extends: .native_build_job
-  needs:
-    - x64-fedora-rawhide-container
-  variables:
-    NAME: fedora-rawhide
-
-x64-fedora-rawhide-clang:
-  extends: .native_build_job
-  needs:
-    - x64-fedora-rawhide-container
-  variables:
-    NAME: fedora-rawhide
-    CC: clang
-    RPM: skip
-
-x64-opensuse-leap-152:
-  extends: .native_build_job
-  needs:
-    - x64-opensuse-leap-152-container
-  variables:
-    NAME: opensuse-leap-152
-    RPM: skip
-
-x64-opensuse-tumbleweed:
-  extends: .native_build_job
-  needs:
-    - x64-opensuse-tumbleweed-container
-  variables:
-    NAME: opensuse-tumbleweed
-    RPM: skip
-
-x64-ubuntu-1804:
-  extends: .native_build_job
-  needs:
-    - x64-ubuntu-1804-container
-  variables:
-    NAME: ubuntu-1804
-
-x64-ubuntu-2004:
-  extends: .native_build_job
-  needs:
-    - x64-ubuntu-2004-container
-  variables:
-    NAME: ubuntu-2004
-    ASAN_OPTIONS: verify_asan_link_order=0
-    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
-x64-ubuntu-2004-clang:
-  extends: .native_build_job
-  needs:
-    - x64-ubuntu-2004-container
-  variables:
-    NAME: ubuntu-2004
-    CC: clang
-    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
-
-x64-freebsd-12-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: freebsd-12
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_IMAGE_NAME: freebsd-12-2
-    UPDATE_COMMAND: pkg update
-    UPGRADE_COMMAND: pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
-
-x64-freebsd-13-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: freebsd-13
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_IMAGE_NAME: freebsd-13-0
-    UPDATE_COMMAND: pkg update
-    UPGRADE_COMMAND: pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
-
-x64-macos-11-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: macos-11
-    CIRRUS_VM_INSTANCE_TYPE: osx_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: big-sur-base
-    UPDATE_COMMAND: brew update
-    UPGRADE_COMMAND: brew upgrade
-    INSTALL_COMMAND: brew install
-    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
-    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
-
-# Cross compiled build jobs
-
-aarch64-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - aarch64-debian-sid-container
-  variables:
-    NAME: debian-sid
-    CROSS: aarch64
-
-armv6l-debian-10:
-  extends: .cross_build_job
-  needs:
-    - armv6l-debian-10-container
-  variables:
-    NAME: debian-10
-    CROSS: armv6l
-
-armv7l-debian-10:
-  extends: .cross_build_job
-  needs:
-    - armv7l-debian-10-container
-  variables:
-    NAME: debian-10
-    CROSS: armv7l
-
-i686-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - i686-debian-sid-container
-  variables:
-    NAME: debian-sid
-    CROSS: i686
-
-mips-debian-10:
-  extends: .cross_build_job
-  needs:
-    - mips-debian-10-container
-  variables:
-    NAME: debian-10
-    CROSS: mips
-
-mips64el-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - mips64el-debian-sid-container
-  variables:
-    NAME: debian-sid
-    CROSS: mips64el
-
-mipsel-debian-10:
-  extends: .cross_build_job
-  needs:
-    - mipsel-debian-10-container
-  variables:
-    NAME: debian-10
-    CROSS: mipsel
-
-ppc64le-debian-10:
-  extends: .cross_build_job
-  needs:
-    - ppc64le-debian-10-container
-  variables:
-    NAME: debian-10
-    CROSS: ppc64le
-
-s390x-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - s390x-debian-sid-container
-  variables:
-    NAME: debian-sid
-    CROSS: s390x
-
-mingw32-fedora-rawhide:
-  extends: .cross_build_job
-  needs:
-    - mingw32-fedora-rawhide-container
-  variables:
-    NAME: fedora-rawhide
-    CROSS: mingw32
-
-mingw64-fedora-rawhide:
-  extends: .cross_build_job
-  needs:
-    - mingw64-fedora-rawhide-container
-  variables:
-    NAME: fedora-rawhide
-    CROSS: mingw64
-
 # This artifact published by this job is downloaded by libvirt.org to
 # be deployed to the web root:
 #    https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website
@@ -545,7 +64,7 @@ website:
   stage: builds
   image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
   needs:
-    - x64-centos-8-container
+    - x86_64-centos-8-container
   before_script:
     - *script_variables
   script:
@@ -565,7 +84,7 @@ codestyle:
   stage: sanity_checks
   image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
   needs:
-    - x64-opensuse-leap-152-container
+    - x86_64-opensuse-leap-152-container
   before_script:
     - *script_variables
   script:
@@ -581,7 +100,7 @@ potfile:
   stage: builds
   image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
   needs:
-    - x64-centos-8-container
+    - x86_64-centos-8-container
   rules:
     - if: "$CI_COMMIT_BRANCH == 'master'"
   before_script:
@@ -599,28 +118,11 @@ potfile:
     paths:
       - libvirt.pot
 
-
-# Check that all commits are signed-off for the DCO.
-# Skip on "libvirt" namespace, since we only need to run
-# this test on developer's personal forks from which
-# merge requests are submitted
-check-dco:
-  stage: sanity_checks
-  needs: []
-  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
-  script:
-    - /check-dco
-  rules:
-    - if: "$CI_PROJECT_NAMESPACE != 'libvirt'"
-  variables:
-    GIT_DEPTH: 1000
-
-
 # Coverity job that is run only by schedules
 coverity:
   image: $CI_REGISTRY_IMAGE/ci-centos-8:latest
   needs:
-    - x64-centos-8-container
+    - x86_64-centos-8-container
   stage: builds
   script:
     - curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz
index 36bcc522dcc8f9cb081bec6292eda0593a0987d4..4318b255e920625783d617055a3509d1c0c2ff00 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables freebsd-12 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 8a86f55237cb4e6cd519511000980c9c1b39970c..4318b255e920625783d617055a3509d1c0c2ff00 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables freebsd-13 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index d3089863843ea3c3d2aecb6d472c967de1a360ae..4318b255e920625783d617055a3509d1c0c2ff00 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables freebsd-current libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 1da29e9ed6b672c7a9e181bdefb35574e3577db7..065d86aa45178d36ea08000379fb1826cfb303b1 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables macos-11 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 2667e5f4f8d5726b08ee9ec0bcd3648856f9ad4e..5ac1e45459ae71a469504c99c02d81e370f73eaa 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile centos-8 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index f89f7648fee85060945d31ab0ab8b2472e438f76..6baf5765800d5b9787e44e5e5435c6c278e5dd04 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile centos-stream-8 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index b81a3f123e79fe3520fdcca8402e91058f82b811..3f0010d081073690cef9329496596b8ecc09d3a9 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross aarch64 debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index dcfb73d83a0b2388fe43870d5736090cd7a5d5a9..853844d3f160ab249ec96894516ddd0d7365f964 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross armv6l debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index f125fc17899e5cf496f7de82254a16f0b00038b9..4d00116849a06758404add812792bc26d3d5d65f 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross armv7l debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index fe9f9e3a6def7951722b940824baf671b35e0432..9c50fe067498ee76a98cf8d1ae97cd2d4cecb0bc 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross i686 debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index c1b441de4071e793e25b9ebcdf4c59e6f4fd4e37..fbeb8db795a0a2a005b3dc25cd5920088347370b 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mips debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index bdce6891485d1114dac748a94008e5b1cd5bd6b3..5212a029995afbd790790d7b3b95602c340a7435 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mips64el debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 0bfa1e05520af151ed641cc476083473eb216d19..2e9e716b21c9f44722352e3f855915f217ecd330 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mipsel debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 08cc080f8ab8e4d115281ad4bb9ae4adff2be314..2f1a56a6244887579e89cb044481250837377761 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross ppc64le debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 62f0584129105d12de0c31ac4412e4d28e73d20a..d7b06ec383877f171ca6340d0d43b3bf136c5c64 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross s390x debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 211442c673d5d6141c7160fc091bb9c705b50318..633d9a972e2a37588b7e5d5da7d06899f2a80ee4 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile debian-10 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 3dcba9038acee73c409809b7b62d18c9f1fa62cb..e481c63388053925d083c5d496850913635f91cf 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross aarch64 debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 34255cd3b04d94e49a96619178f67a78d3112a49..3f63b3e86fec0b446d99d908957d8fb191fc1355 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross armv6l debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 8ec54bdee13a7a1b76e972b83fe8edce059259fa..55f527b207b7840ca8800817871b54fe303dafaa 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross armv7l debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 555e36d014fc92eaba322e9ffe6e2361f34d9aaf..719547ab31d485d73c89d25d93371ac8807b6240 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross i686 debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 20478e1f02458bed235397039326915b7ce7c221..e1fac818a1dc0802229836fa93f65f42c5dbc120 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mips64el debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index abf0642bd62bc6b1a5d7367403a66eef677f2b84..3684fe3bf9a4e6611eaa561660ce571b229f5330 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mipsel debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index a339905329eead34981f49795f17200bc05b1d90..1d1aa18e3361138e88fafcf974e796e97e2c3139 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross ppc64le debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index c29bb57d88d735326abb3205264c0f9baeeff087..5d2fdd6a1beda50b37fcb0d8bc9bd43de4a8e897 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross s390x debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index cb6a24cb50e6a5815c263053527a1b1f8ae604bb..d8667c5f1b4dd175aff605b8c93eba6239136f4e 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile debian-sid libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 7350de493f2ba852ff2e5a2b5fb45b50fdc0dae8..0025e66d6a0e2063346fd73ac10f61a69d7189ee 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile fedora-33 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 10a19a8f519e9be968017cc8d9670859ed69afb5..9be6efc7ba2670d4cd07ef5ce2cdd3e67f059b24 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile fedora-34 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 48c4dd36426e493cfedded1ee8baa7d08c29300d..6f009403475542c8cb263f01779757a9440af323 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 38fb9a6aeb8993c70ddfbd5981b22d9c83677687..48c2a755d32aa0cc45c54038d05216fb9e48d292 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index b36fb9343eceaf6f2c180b791b659b786cefaeb3..74e1f014830c9ed6b78e73d60811b3bf76770c8c 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile fedora-rawhide libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index abe3e57185acd44f33a49b1429f7f5f992fccae1..23f03ed482e022012fc515afe4b62e6ee2f2dc9b 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile opensuse-leap-152 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 18b136fe035fb9f2e6242504243dcedb99649d1e..be2d6b6d25d1c0096f8c8ad75a6892e5d77d20e6 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile opensuse-tumbleweed libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 21b73e62aa727b50ad2a20283ff18031cd007acd..6dcd965e65a5cd17f2a94073e7f83f35ee9c03cd 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile ubuntu-1804 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
index 5654ad003f4726e4b9dc2732cb75a67536534087..f86eb9aef5bfac0da1afbe790f07ac77f2f97b9b 100644 (file)
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile ubuntu-2004 libvirt
+#  $ lcitool manifest ci/manifest.yml
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
new file mode 100644 (file)
index 0000000..6063ce8
--- /dev/null
@@ -0,0 +1,602 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+
+.container_job:
+  image: docker:stable
+  stage: containers
+  needs: []
+  services:
+    - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master
+      alias: docker
+  before_script:
+    - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
+    - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest"
+    - docker info
+    - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+  script:
+    - 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
+    - docker push "$TAG"
+  after_script:
+    - docker logout
+
+
+.gitlab_native_build_job:
+  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+  stage: builds
+
+
+.gitlab_cross_build_job:
+  image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
+  stage: builds
+
+
+.cirrus_build_job:
+  stage: builds
+  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
+  needs: []
+  script:
+    - source ci/cirrus/$NAME.vars
+    - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g"
+          -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g"
+          -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g"
+          -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g"
+          -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g"
+          -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g"
+          -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g"
+          -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g"
+          -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g"
+          -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g"
+          -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g"
+          -e "s|[@]PKGS@|$PKGS|g"
+          -e "s|[@]MAKE@|$MAKE|g"
+          -e "s|[@]PYTHON@|$PYTHON|g"
+          -e "s|[@]PIP3@|$PIP3|g"
+          -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
+      <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
+    - cat ci/cirrus/$NAME.yml
+    - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
+  rules:
+    - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
+
+
+check-dco:
+  stage: sanity_checks
+  needs: []
+  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
+  script:
+    - /check-dco libvirt
+  except:
+    variables:
+      - $CI_PROJECT_NAMESPACE == 'libvirt'
+  variables:
+    GIT_DEPTH: 1000
+
+
+# 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
+  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-33-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-33
+
+
+x86_64-fedora-34-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-34
+
+
+x86_64-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide
+
+
+x86_64-opensuse-leap-152-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: opensuse-leap-152
+
+
+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
+
+aarch64-debian-10-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-10-cross-aarch64
+
+
+armv6l-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10-cross-armv6l
+
+
+armv7l-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10-cross-armv7l
+
+
+i686-debian-10-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-10-cross-i686
+
+
+mips-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10-cross-mips
+
+
+mips64el-debian-10-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-10-cross-mips64el
+
+
+mipsel-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10-cross-mipsel
+
+
+ppc64le-debian-10-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-10-cross-ppc64le
+
+
+s390x-debian-10-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-10-cross-s390x
+
+
+aarch64-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid-cross-aarch64
+
+
+armv6l-debian-sid-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-sid-cross-armv6l
+
+
+armv7l-debian-sid-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-sid-cross-armv7l
+
+
+i686-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid-cross-i686
+
+
+mips64el-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid-cross-mips64el
+
+
+mipsel-debian-sid-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-sid-cross-mipsel
+
+
+ppc64le-debian-sid-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-sid-cross-ppc64le
+
+
+s390x-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid-cross-s390x
+
+
+mingw32-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide-cross-mingw32
+
+
+mingw64-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide-cross-mingw64
+
+
+# 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-8-clang:
+  extends: .native_build_job
+  needs:
+    - x86_64-centos-8-container
+  allow_failure: false
+  variables:
+    NAME: centos-8
+    RPM: skip
+    CC: clang
+
+
+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-10-clang:
+  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-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:
+    - x86_64-fedora-34-container
+  allow_failure: false
+  variables:
+    NAME: fedora-34
+
+
+x86_64-fedora-rawhide:
+  extends: .native_build_job
+  needs:
+    - x86_64-fedora-rawhide-container
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide
+
+
+x86_64-fedora-rawhide-clang:
+  extends: .native_build_job
+  needs:
+    - x86_64-fedora-rawhide-container
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide
+    CC: clang
+    RPM: skip
+
+
+x86_64-opensuse-leap-152:
+  extends: .native_build_job
+  needs:
+    - x86_64-opensuse-leap-152-container
+  allow_failure: false
+  variables:
+    NAME: opensuse-leap-152
+    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
+    ASAN_OPTIONS: verify_asan_link_order=0
+    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+
+
+x86_64-ubuntu-2004-clang:
+  extends: .native_build_job
+  needs:
+    - x86_64-ubuntu-2004-container
+  allow_failure: false
+  variables:
+    NAME: ubuntu-2004
+    CC: clang
+    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+
+
+
+# Cross build jobs
+
+armv6l-debian-10:
+  extends: .cross_build_job
+  needs:
+    - armv6l-debian-10-container
+  allow_failure: false
+  variables:
+    NAME: debian-10
+    CROSS: armv6l
+
+
+armv7l-debian-10:
+  extends: .cross_build_job
+  needs:
+    - armv7l-debian-10-container
+  allow_failure: false
+  variables:
+    NAME: debian-10
+    CROSS: armv7l
+
+
+mips-debian-10:
+  extends: .cross_build_job
+  needs:
+    - mips-debian-10-container
+  allow_failure: false
+  variables:
+    NAME: debian-10
+    CROSS: mips
+
+
+mipsel-debian-10:
+  extends: .cross_build_job
+  needs:
+    - mipsel-debian-10-container
+  allow_failure: false
+  variables:
+    NAME: debian-10
+    CROSS: mipsel
+
+
+ppc64le-debian-10:
+  extends: .cross_build_job
+  needs:
+    - ppc64le-debian-10-container
+  allow_failure: false
+  variables:
+    NAME: debian-10
+    CROSS: ppc64le
+
+
+aarch64-debian-sid:
+  extends: .cross_build_job
+  needs:
+    - aarch64-debian-sid-container
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+    CROSS: aarch64
+
+
+i686-debian-sid:
+  extends: .cross_build_job
+  needs:
+    - i686-debian-sid-container
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+    CROSS: i686
+
+
+mips64el-debian-sid:
+  extends: .cross_build_job
+  needs:
+    - mips64el-debian-sid-container
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+    CROSS: mips64el
+
+
+s390x-debian-sid:
+  extends: .cross_build_job
+  needs:
+    - s390x-debian-sid-container
+  allow_failure: false
+  variables:
+    NAME: debian-sid
+    CROSS: s390x
+
+
+mingw32-fedora-rawhide:
+  extends: .cross_build_job
+  needs:
+    - mingw32-fedora-rawhide-container
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide
+    CROSS: mingw32
+
+
+mingw64-fedora-rawhide:
+  extends: .cross_build_job
+  needs:
+    - mingw64-fedora-rawhide-container
+  allow_failure: true
+  variables:
+    NAME: fedora-rawhide
+    CROSS: mingw64
+
+
+# Native cirrus build jobs
+
+x86_64-freebsd-12:
+  extends: .cirrus_build_job
+  needs: []
+  allow_failure: false
+  variables:
+    NAME: freebsd-12
+    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    CIRRUS_VM_IMAGE_SELECTOR: image_family
+    CIRRUS_VM_IMAGE_NAME: freebsd-12-2
+    UPDATE_COMMAND: pkg update
+    UPGRADE_COMMAND: pkg upgrade -y
+    INSTALL_COMMAND: pkg install -y
+
+
+x86_64-freebsd-13:
+  extends: .cirrus_build_job
+  needs: []
+  allow_failure: false
+  variables:
+    NAME: freebsd-13
+    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    CIRRUS_VM_IMAGE_SELECTOR: image_family
+    CIRRUS_VM_IMAGE_NAME: freebsd-13-0
+    UPDATE_COMMAND: pkg update
+    UPGRADE_COMMAND: pkg upgrade -y
+    INSTALL_COMMAND: pkg install -y
+
+
+x86_64-macos-11:
+  extends: .cirrus_build_job
+  needs: []
+  allow_failure: false
+  variables:
+    NAME: macos-11
+    CIRRUS_VM_INSTANCE_TYPE: osx_instance
+    CIRRUS_VM_IMAGE_SELECTOR: image
+    CIRRUS_VM_IMAGE_NAME: big-sur-base
+    UPDATE_COMMAND: brew update
+    UPGRADE_COMMAND: brew upgrade
+    INSTALL_COMMAND: brew install
+    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
+    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig