ci: re-generate containers/gitlab config from manifest

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>
2024-12-22 05:35:25 +00:00 · 2021-09-09 14:49:01 +01:00 · 2021-09-09 14:49:01 +01:00 · ccc7a44adb
commit ccc7a44adb
parent 712407ed1e
36 changed files with 643 additions and 539 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -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
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@ -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

--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@ -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

--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@ -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

--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@ -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

--- a/ci/containers/centos-8.Dockerfile
+++ b/ci/containers/centos-8.Dockerfile
@ -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

--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@ -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

--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@ -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

--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@ -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

--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@ -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

--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@ -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

--- a/ci/containers/fedora-33.Dockerfile
+++ b/ci/containers/fedora-33.Dockerfile
@ -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

--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@ -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

--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@ -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

--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@ -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

--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@ -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

--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@ -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

--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@ -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

--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@ -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

--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@ -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

--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@ -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