[PATCH 0/3] gitlab: remove x64-freebsd-14-build job and Cirrus CI integration

[PATCH 0/3] gitlab: remove x64-freebsd-14-build job and Cirrus CI integration

[Stefan Hajnoczi]

Cirrus CI shut down yesterday and the x64-freebsd-14-build CI job is now
failing. This patch series removes the job as well as the Cirrus CI integration
in lcitool.

Warner is setting up a gitlab-runner on a VM hosted by OSUOSL for QEMU. It will
be possible to test FreeBSD builds again when it comes online.

Stefan Hajnoczi (3):
  gitlab: remove x64-freebsd-14-build Cirrus job
  lcitool: remove Cirrus CI support
  MAINTAINERS: remove stale Cirrus macOS build job path

 MAINTAINERS                         |  3 --
 .gitlab-ci.d/cirrus/README.rst      | 54 -----------------------------
 docs/devel/testing/main.rst         |  4 +--
 .gitlab-ci.d/base.yml               |  4 ---
 .gitlab-ci.d/cirrus.yml             | 46 ------------------------
 .gitlab-ci.d/cirrus/build.yml       | 42 ----------------------
 .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ---------
 .gitlab-ci.d/qemu-project.yml       |  1 -
 docs/devel/testing/ci-jobs.rst.inc  |  6 ----
 tests/lcitool/refresh               | 11 ------
 10 files changed, 2 insertions(+), 185 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/README.rst
 delete mode 100644 .gitlab-ci.d/cirrus.yml
 delete mode 100644 .gitlab-ci.d/cirrus/build.yml
 delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars

-- 
2.54.0

[PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job

[Stefan Hajnoczi]

Cirrus has shut down and the x64-freebsd-14-build is failing:
https://gitlab.com/qemu-project/qemu/-/jobs/14656732122

Remove the x64-freebsd-14-build job to get the CI pipeline passing
again. The next commit will be to remove Cirrus integration from the
GitLab YAML and lcitool since it is no longer used.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                         |  2 --
 .gitlab-ci.d/cirrus.yml             | 14 --------------
 .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ----------------
 tests/lcitool/refresh               |  5 -----
 4 files changed, 37 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars

diff --git a/MAINTAINERS b/MAINTAINERS
index 7752917d8c..4ff33eb630 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4511,9 +4511,7 @@ W: https://travis-ci.org/qemu/qemu
 FreeBSD Hosted Continuous Integration
 M: Li-Wen Hsu <lwhsu@freebsd.org>
 S: Maintained
-F: .gitlab-ci.d/cirrus/freebsd*
 F: tests/vm/freebsd
-W: https://cirrus-ci.com/github/qemu/qemu
 
 Functional testing framework
 M: Thomas Huth <th.huth+qemu@posteo.eu>
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index b71ab090b6..4769d00c67 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -30,17 +30,3 @@
     - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml
   variables:
     QEMU_JOB_CIRRUS: 1
-
-x64-freebsd-14-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: freebsd-14
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_IMAGE_NAME: freebsd-14-3
-    CIRRUS_VM_CPUS: 8
-    CIRRUS_VM_RAM: 8G
-    UPDATE_COMMAND: pkg update; pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
-    CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu --enable-rust
-    TEST_TARGETS: check
diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars b/.gitlab-ci.d/cirrus/freebsd-14.vars
deleted file mode 100644
index 98fbde6cc6..0000000000
--- a/.gitlab-ci.d/cirrus/freebsd-14.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool variables freebsd-14 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
-PACKAGING_COMMAND='pkg'
-PIP3='/usr/local/bin/pip'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka coreutils ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-setuptools py311-sphinx py311-sphinx_rtd_theme py311-tomli py311-wheel python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 96ee861cbf..e903a33f7a 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -303,11 +303,6 @@ try:
                         enable_rust=False,
                         trailer="".join(debian_all_test_cross_compilers))
 
-    #
-    # Cirrus packages lists for GitLab
-    #
-    generate_cirrus("freebsd-14")
-
     #
     # GitLab packages lists
     #
-- 
2.54.0

[PATCH 2/3] lcitool: remove Cirrus CI support

[Stefan Hajnoczi]

Remove GitLab CI integration for Cirrus CI now that nothing uses it
anymore.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitlab-ci.d/cirrus/README.rst     | 54 ------------------------------
 docs/devel/testing/main.rst        |  4 +--
 .gitlab-ci.d/base.yml              |  4 ---
 .gitlab-ci.d/cirrus.yml            | 32 ------------------
 .gitlab-ci.d/cirrus/build.yml      | 42 -----------------------
 .gitlab-ci.d/qemu-project.yml      |  1 -
 docs/devel/testing/ci-jobs.rst.inc |  6 ----
 tests/lcitool/refresh              |  6 ----
 8 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/README.rst
 delete mode 100644 .gitlab-ci.d/cirrus.yml
 delete mode 100644 .gitlab-ci.d/cirrus/build.yml

diff --git a/.gitlab-ci.d/cirrus/README.rst b/.gitlab-ci.d/cirrus/README.rst
deleted file mode 100644
index 657b0706d7..0000000000
--- a/.gitlab-ci.d/cirrus/README.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-Cirrus CI integration
-=====================
-
-GitLab CI shared runners only provide a docker environment running on Linux.
-While it is possible to provide private runners for non-Linux platforms this
-is not something most contributors/maintainers will wish to do.
-
-To work around this limitation, we take advantage of `Cirrus CI`_'s free
-offering: more specifically, we use the `cirrus-run`_ script to trigger Cirrus
-CI jobs from GitLab CI jobs so that Cirrus CI job output is integrated into
-the main GitLab CI pipeline dashboard.
-
-There is, however, some one-time setup required. If you want FreeBSD and macOS
-builds to happen when you push to your GitLab repository, you need to
-
-* set up a GitHub repository for the project, eg. ``yourusername/qemu``.
-  This repository needs to exist for cirrus-run to work, but it doesn't need to
-  be kept up to date, so you can create it and then forget about it;
-
-* enable the `Cirrus CI GitHub app`_  for your GitHub account;
-
-* sign up for Cirrus CI. It's enough to log into the website using your GitHub
-  account;
-
-* grab an API token from the `Cirrus CI settings`_ page;
-
-* it may be necessary to push an empty ``.cirrus.yml`` file to your github fork
-  for Cirrus CI to properly recognize the project. You can check whether
-  Cirrus CI knows about your project by navigating to:
-
-  ``https://cirrus-ci.com/yourusername/qemu``
-
-* in the *CI/CD / Variables* section of the settings page for your GitLab
-  repository, create two new variables:
-
-  * ``CIRRUS_GITHUB_REPO``, containing the name of the GitHub repository
-    created earlier, eg. ``yourusername/qemu``;
-
-  * ``CIRRUS_API_TOKEN``, containing the Cirrus CI API token generated earlier.
-    This variable **must** be marked as *Masked*, because anyone with knowledge
-    of it can impersonate you as far as Cirrus CI is concerned.
-
-  Neither of these variables should be marked as *Protected*, because in
-  general you'll want to be able to trigger Cirrus CI builds from non-protected
-  branches.
-
-Once this one-time setup is complete, you can just keep pushing to your GitLab
-repository as usual and you'll automatically get the additional CI coverage.
-
-
-.. _Cirrus CI GitHub app: https://github.com/marketplace/cirrus-ci
-.. _Cirrus CI settings: https://cirrus-ci.com/settings/profile/
-.. _Cirrus CI: https://cirrus-ci.com/
-.. _cirrus-run: https://github.com/sio/cirrus-run/
diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst
index c0321d1d25..3408b5836d 100644
--- a/docs/devel/testing/main.rst
+++ b/docs/devel/testing/main.rst
@@ -551,8 +551,8 @@ mappings to distribution package names for a wide variety of third
 party projects.  ``lcitool`` applies the mappings to a list of build
 pre-requisites in ``tests/lcitool/projects/qemu.yml``, determines the
 list of native packages to install on each distribution, and uses them
-to generate build environments (dockerfiles and Cirrus CI variable files)
-that are consistent across OS distribution.
+to generate build environments (dockerfiles) that are consistent across OS
+distribution.
 
 
 Adding new build pre-requisites
diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml
index 7640a1d52c..72eadc8073 100644
--- a/.gitlab-ci.d/base.yml
+++ b/.gitlab-ci.d/base.yml
@@ -52,10 +52,6 @@ variables:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
 
-    # Cirrus jobs can't run unless the creds / target repo are set
-    - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null)'
-      when: never
-
     # Publishing jobs should only run on the default branch in upstream
     - if: '$QEMU_JOB_PUBLISH == "1" && $CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
       when: never
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
deleted file mode 100644
index 4769d00c67..0000000000
--- a/.gitlab-ci.d/cirrus.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.
-#
-# 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:
-  extends: .base_job_template
-  stage: build
-  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest
-  needs: []
-  allow_failure:
-    exit_codes: 3
-  # 20 mins larger than "timeout_in" in cirrus/build.yml
-  # as there's often a 5-10 minute delay before Cirrus CI
-  # actually starts the task
-  timeout: 80m
-  script:
-    - set -o allexport
-    - source .gitlab-ci.d/cirrus/$NAME.vars
-    - set +o allexport
-    - cirrus-vars <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml
-    - cat .gitlab-ci.d/cirrus/$NAME.yml
-    - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml
-  variables:
-    QEMU_JOB_CIRRUS: 1
diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml
deleted file mode 100644
index 41abd0b31a..0000000000
--- a/.gitlab-ci.d/cirrus/build.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-@CIRRUS_VM_INSTANCE_TYPE@:
-  @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@
-  cpu: @CIRRUS_VM_CPUS@
-  memory: @CIRRUS_VM_RAM@
-
-env:
-  CIRRUS_CLONE_DEPTH: 1
-  CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@"
-  CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@"
-  CI_COMMIT_SHA: "@CI_COMMIT_SHA@"
-  PATH: "@PATH_EXTRA@:$PATH"
-  PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@"
-  PYTHON: "@PYTHON@"
-  MAKE: "@MAKE@"
-  CONFIGURE_ARGS: "@CONFIGURE_ARGS@"
-  TEST_TARGETS: "@TEST_TARGETS@"
-
-build_task:
-  # A little shorter than GitLab timeout in ../cirrus.yml
-  timeout_in: 60m
-  install_script:
-    - @UPDATE_COMMAND@
-    - @INSTALL_COMMAND@ @PKGS@
-    - if test -n "@PYPI_PKGS@" ; then PYLIB=$(@PYTHON@ -c 'import sysconfig; print(sysconfig.get_path("stdlib"))'); rm -f $PYLIB/EXTERNALLY-MANAGED; @PIP3@ install @PYPI_PKGS@ ; fi
-  clone_script:
-    - git clone --depth 100 "$CI_REPOSITORY_URL" .
-    - git fetch origin "$CI_COMMIT_REF_NAME"
-    - git reset --hard "$CI_COMMIT_SHA"
-  step_script:
-    - mkdir build
-    - cd build
-    - ../configure --enable-werror $CONFIGURE_ARGS
-      || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - $MAKE -j$(sysctl -n hw.ncpu)
-    - for TARGET in $TEST_TARGETS ;
-      do
-        $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ;
-      done
-  always:
-    build_result_artifacts:
-      path: build/meson-logs/*log.txt
-      type: text/plain
diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml
index 9cbb5fe787..104a147b2d 100644
--- a/.gitlab-ci.d/qemu-project.yml
+++ b/.gitlab-ci.d/qemu-project.yml
@@ -17,6 +17,5 @@ include:
   - local: '/.gitlab-ci.d/buildtest.yml'
   - local: '/.gitlab-ci.d/static_checks.yml'
   - local: '/.gitlab-ci.d/custom-runners.yml'
-  - local: '/.gitlab-ci.d/cirrus.yml'
   - local: '/.gitlab-ci.d/windows.yml'
   - local: '/.gitlab-ci.d/macos.yml'
diff --git a/docs/devel/testing/ci-jobs.rst.inc b/docs/devel/testing/ci-jobs.rst.inc
index f1c70344ec..d5b081978a 100644
--- a/docs/devel/testing/ci-jobs.rst.inc
+++ b/docs/devel/testing/ci-jobs.rst.inc
@@ -91,12 +91,6 @@ Maintainer controlled job variables
 The following variables may be set when defining a job in the
 CI configuration file.
 
-QEMU_JOB_CIRRUS
-~~~~~~~~~~~~~~~
-
-The job makes use of Cirrus CI infrastructure, requiring the
-configuration setup for cirrus-run to be present in the repository
-
 QEMU_JOB_OPTIONAL
 ~~~~~~~~~~~~~~~~~
 
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index e903a33f7a..fa545cf1f4 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -81,12 +81,6 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
     generate(filename, cmd, trailer)
 
 
-def generate_cirrus(target, trailer=None):
-    filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
-    cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
-    generate(filename, cmd, trailer)
-
-
 def generate_vars(target, trailer=None):
     filename = Path(src_dir, ".gitlab-ci.d", target + ".vars")
     cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
-- 
2.54.0

[PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Stefan Hajnoczi]

Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
macOS build job. The MAINTAINERS file now contains a stale path that
should be removed.

Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ff33eb630..0c0c8c0a37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -701,7 +701,6 @@ F: scripts/nsis.py
 Darwin (macOS, iOS)
 M: Philippe Mathieu-Daudé <philmd@mailo.com>
 S: Odd Fixes
-F: .gitlab-ci.d/cirrus/macos-*
 F: */*.m
 F: scripts/entitlement.sh
 
-- 
2.54.0

Re: [PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job

[Pierrick Bouvier]

On 6/2/2026 9:24 AM, Stefan Hajnoczi wrote:
> Cirrus has shut down and the x64-freebsd-14-build is failing:
> https://gitlab.com/qemu-project/qemu/-/jobs/14656732122
> 
> Remove the x64-freebsd-14-build job to get the CI pipeline passing
> again. The next commit will be to remove Cirrus integration from the
> GitLab YAML and lcitool since it is no longer used.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  MAINTAINERS                         |  2 --
>  .gitlab-ci.d/cirrus.yml             | 14 --------------
>  .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ----------------
>  tests/lcitool/refresh               |  5 -----
>  4 files changed, 37 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

Re: [PATCH 2/3] lcitool: remove Cirrus CI support

[Pierrick Bouvier]

On 6/2/2026 9:24 AM, Stefan Hajnoczi wrote:
> Remove GitLab CI integration for Cirrus CI now that nothing uses it
> anymore.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  .gitlab-ci.d/cirrus/README.rst     | 54 ------------------------------
>  docs/devel/testing/main.rst        |  4 +--
>  .gitlab-ci.d/base.yml              |  4 ---
>  .gitlab-ci.d/cirrus.yml            | 32 ------------------
>  .gitlab-ci.d/cirrus/build.yml      | 42 -----------------------
>  .gitlab-ci.d/qemu-project.yml      |  1 -
>  docs/devel/testing/ci-jobs.rst.inc |  6 ----
>  tests/lcitool/refresh              |  6 ----
>  8 files changed, 2 insertions(+), 147 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/README.rst
>  delete mode 100644 .gitlab-ci.d/cirrus.yml
>  delete mode 100644 .gitlab-ci.d/cirrus/build.yml
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

Re: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Pierrick Bouvier]

On 6/2/2026 9:24 AM, Stefan Hajnoczi wrote:
> Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
> macOS build job. The MAINTAINERS file now contains a stale path that
> should be removed.
> 
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

Re: [PATCH 2/3] lcitool: remove Cirrus CI support

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 10550 bytes --]

On Tue, Jun 2, 2026 at 9:25 AM Stefan Hajnoczi <stefanha@redhat.com> wrote:

> Remove GitLab CI integration for Cirrus CI now that nothing uses it
> anymore.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  .gitlab-ci.d/cirrus/README.rst     | 54 ------------------------------
>  docs/devel/testing/main.rst        |  4 +--
>  .gitlab-ci.d/base.yml              |  4 ---
>  .gitlab-ci.d/cirrus.yml            | 32 ------------------
>  .gitlab-ci.d/cirrus/build.yml      | 42 -----------------------
>  .gitlab-ci.d/qemu-project.yml      |  1 -
>  docs/devel/testing/ci-jobs.rst.inc |  6 ----
>  tests/lcitool/refresh              |  6 ----
>  8 files changed, 2 insertions(+), 147 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/README.rst
>  delete mode 100644 .gitlab-ci.d/cirrus.yml
>  delete mode 100644 .gitlab-ci.d/cirrus/build.yml
>

Reviewed-by: Warner Losh <imp@bsdimp.com>


> diff --git a/.gitlab-ci.d/cirrus/README.rst
> b/.gitlab-ci.d/cirrus/README.rst
> deleted file mode 100644
> index 657b0706d7..0000000000
> --- a/.gitlab-ci.d/cirrus/README.rst
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -Cirrus CI integration
> -=====================
> -
> -GitLab CI shared runners only provide a docker environment running on
> Linux.
> -While it is possible to provide private runners for non-Linux platforms
> this
> -is not something most contributors/maintainers will wish to do.
> -
> -To work around this limitation, we take advantage of `Cirrus CI`_'s free
> -offering: more specifically, we use the `cirrus-run`_ script to trigger
> Cirrus
> -CI jobs from GitLab CI jobs so that Cirrus CI job output is integrated
> into
> -the main GitLab CI pipeline dashboard.
> -
> -There is, however, some one-time setup required. If you want FreeBSD and
> macOS
> -builds to happen when you push to your GitLab repository, you need to
> -
> -* set up a GitHub repository for the project, eg. ``yourusername/qemu``.
> -  This repository needs to exist for cirrus-run to work, but it doesn't
> need to
> -  be kept up to date, so you can create it and then forget about it;
> -
> -* enable the `Cirrus CI GitHub app`_  for your GitHub account;
> -
> -* sign up for Cirrus CI. It's enough to log into the website using your
> GitHub
> -  account;
> -
> -* grab an API token from the `Cirrus CI settings`_ page;
> -
> -* it may be necessary to push an empty ``.cirrus.yml`` file to your
> github fork
> -  for Cirrus CI to properly recognize the project. You can check whether
> -  Cirrus CI knows about your project by navigating to:
> -
> -  ``https://cirrus-ci.com/yourusername/qemu``
> <https://cirrus-ci.com/yourusername/qemu>
> -
> -* in the *CI/CD / Variables* section of the settings page for your GitLab
> -  repository, create two new variables:
> -
> -  * ``CIRRUS_GITHUB_REPO``, containing the name of the GitHub repository
> -    created earlier, eg. ``yourusername/qemu``;
> -
> -  * ``CIRRUS_API_TOKEN``, containing the Cirrus CI API token generated
> earlier.
> -    This variable **must** be marked as *Masked*, because anyone with
> knowledge
> -    of it can impersonate you as far as Cirrus CI is concerned.
> -
> -  Neither of these variables should be marked as *Protected*, because in
> -  general you'll want to be able to trigger Cirrus CI builds from
> non-protected
> -  branches.
> -
> -Once this one-time setup is complete, you can just keep pushing to your
> GitLab
> -repository as usual and you'll automatically get the additional CI
> coverage.
> -
> -
> -.. _Cirrus CI GitHub app: https://github.com/marketplace/cirrus-ci
> -.. _Cirrus CI settings: https://cirrus-ci.com/settings/profile/
> -.. _Cirrus CI: https://cirrus-ci.com/
> -.. _cirrus-run: https://github.com/sio/cirrus-run/
> diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst
> index c0321d1d25..3408b5836d 100644
> --- a/docs/devel/testing/main.rst
> +++ b/docs/devel/testing/main.rst
> @@ -551,8 +551,8 @@ mappings to distribution package names for a wide
> variety of third
>  party projects.  ``lcitool`` applies the mappings to a list of build
>  pre-requisites in ``tests/lcitool/projects/qemu.yml``, determines the
>  list of native packages to install on each distribution, and uses them
> -to generate build environments (dockerfiles and Cirrus CI variable files)
> -that are consistent across OS distribution.
> +to generate build environments (dockerfiles) that are consistent across OS
> +distribution.
>
>
>  Adding new build pre-requisites
> diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml
> index 7640a1d52c..72eadc8073 100644
> --- a/.gitlab-ci.d/base.yml
> +++ b/.gitlab-ci.d/base.yml
> @@ -52,10 +52,6 @@ variables:
>      - if: '$CI_PIPELINE_SOURCE == "schedule"'
>        when: never
>
> -    # Cirrus jobs can't run unless the creds / target repo are set
> -    - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == null ||
> $CIRRUS_API_TOKEN == null)'
> -      when: never
> -
>      # Publishing jobs should only run on the default branch in upstream
>      - if: '$QEMU_JOB_PUBLISH == "1" && $CI_PROJECT_NAMESPACE ==
> $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
>        when: never
> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
> deleted file mode 100644
> index 4769d00c67..0000000000
> --- a/.gitlab-ci.d/cirrus.yml
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -# 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.
> -#
> -# 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:
> -  extends: .base_job_template
> -  stage: build
> -  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest
> -  needs: []
> -  allow_failure:
> -    exit_codes: 3
> -  # 20 mins larger than "timeout_in" in cirrus/build.yml
> -  # as there's often a 5-10 minute delay before Cirrus CI
> -  # actually starts the task
> -  timeout: 80m
> -  script:
> -    - set -o allexport
> -    - source .gitlab-ci.d/cirrus/$NAME.vars
> -    - set +o allexport
> -    - cirrus-vars <.gitlab-ci.d/cirrus/build.yml
> >.gitlab-ci.d/cirrus/$NAME.yml
> -    - cat .gitlab-ci.d/cirrus/$NAME.yml
> -    - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml
> -  variables:
> -    QEMU_JOB_CIRRUS: 1
> diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml
> deleted file mode 100644
> index 41abd0b31a..0000000000
> --- a/.gitlab-ci.d/cirrus/build.yml
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -@CIRRUS_VM_INSTANCE_TYPE@:
> -  @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@
> -  cpu: @CIRRUS_VM_CPUS@
> -  memory: @CIRRUS_VM_RAM@
> -
> -env:
> -  CIRRUS_CLONE_DEPTH: 1
> -  CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@"
> -  CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@"
> -  CI_COMMIT_SHA: "@CI_COMMIT_SHA@"
> -  PATH: "@PATH_EXTRA@:$PATH"
> -  PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@"
> -  PYTHON: "@PYTHON@"
> -  MAKE: "@MAKE@"
> -  CONFIGURE_ARGS: "@CONFIGURE_ARGS@"
> -  TEST_TARGETS: "@TEST_TARGETS@"
> -
> -build_task:
> -  # A little shorter than GitLab timeout in ../cirrus.yml
> -  timeout_in: 60m
> -  install_script:
> -    - @UPDATE_COMMAND@
> -    - @INSTALL_COMMAND@ @PKGS@
> -    - if test -n "@PYPI_PKGS@" ; then PYLIB=$(@PYTHON@ -c 'import
> sysconfig; print(sysconfig.get_path("stdlib"))'); rm -f
> $PYLIB/EXTERNALLY-MANAGED; @PIP3@ install @PYPI_PKGS@ ; fi
> -  clone_script:
> -    - git clone --depth 100 "$CI_REPOSITORY_URL" .
> -    - git fetch origin "$CI_COMMIT_REF_NAME"
> -    - git reset --hard "$CI_COMMIT_SHA"
> -  step_script:
> -    - mkdir build
> -    - cd build
> -    - ../configure --enable-werror $CONFIGURE_ARGS
> -      || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - $MAKE -j$(sysctl -n hw.ncpu)
> -    - for TARGET in $TEST_TARGETS ;
> -      do
> -        $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ;
> -      done
> -  always:
> -    build_result_artifacts:
> -      path: build/meson-logs/*log.txt
> -      type: text/plain
> diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml
> index 9cbb5fe787..104a147b2d 100644
> --- a/.gitlab-ci.d/qemu-project.yml
> +++ b/.gitlab-ci.d/qemu-project.yml
> @@ -17,6 +17,5 @@ include:
>    - local: '/.gitlab-ci.d/buildtest.yml'
>    - local: '/.gitlab-ci.d/static_checks.yml'
>    - local: '/.gitlab-ci.d/custom-runners.yml'
> -  - local: '/.gitlab-ci.d/cirrus.yml'
>    - local: '/.gitlab-ci.d/windows.yml'
>    - local: '/.gitlab-ci.d/macos.yml'
> diff --git a/docs/devel/testing/ci-jobs.rst.inc
> b/docs/devel/testing/ci-jobs.rst.inc
> index f1c70344ec..d5b081978a 100644
> --- a/docs/devel/testing/ci-jobs.rst.inc
> +++ b/docs/devel/testing/ci-jobs.rst.inc
> @@ -91,12 +91,6 @@ Maintainer controlled job variables
>  The following variables may be set when defining a job in the
>  CI configuration file.
>
> -QEMU_JOB_CIRRUS
> -~~~~~~~~~~~~~~~
> -
> -The job makes use of Cirrus CI infrastructure, requiring the
> -configuration setup for cirrus-run to be present in the repository
> -
>  QEMU_JOB_OPTIONAL
>  ~~~~~~~~~~~~~~~~~
>
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index e903a33f7a..fa545cf1f4 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -81,12 +81,6 @@ def generate_dockerfile(host, target, project="qemu",
> cross=None, trailer=None,
>      generate(filename, cmd, trailer)
>
>
> -def generate_cirrus(target, trailer=None):
> -    filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
> -    cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
> -    generate(filename, cmd, trailer)
> -
> -
>  def generate_vars(target, trailer=None):
>      filename = Path(src_dir, ".gitlab-ci.d", target + ".vars")
>      cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
> --
> 2.54.0
>
>

[-- Attachment #2: Type: text/html, Size: 12716 bytes --]

Re: [PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 3999 bytes --]

On Tue, Jun 2, 2026 at 9:25 AM Stefan Hajnoczi <stefanha@redhat.com> wrote:

> Cirrus has shut down and the x64-freebsd-14-build is failing:
> https://gitlab.com/qemu-project/qemu/-/jobs/14656732122
>
> Remove the x64-freebsd-14-build job to get the CI pipeline passing
> again. The next commit will be to remove Cirrus integration from the
> GitLab YAML and lcitool since it is no longer used.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  MAINTAINERS                         |  2 --
>  .gitlab-ci.d/cirrus.yml             | 14 --------------
>  .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ----------------
>  tests/lcitool/refresh               |  5 -----
>  4 files changed, 37 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars
>

Reviewed-by: Warner Losh <imp@bsdimp.com>



> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7752917d8c..4ff33eb630 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4511,9 +4511,7 @@ W: https://travis-ci.org/qemu/qemu
>  FreeBSD Hosted Continuous Integration
>  M: Li-Wen Hsu <lwhsu@freebsd.org>
>  S: Maintained
> -F: .gitlab-ci.d/cirrus/freebsd*
>  F: tests/vm/freebsd
> -W: https://cirrus-ci.com/github/qemu/qemu
>
>  Functional testing framework
>  M: Thomas Huth <th.huth+qemu@posteo.eu>
> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
> index b71ab090b6..4769d00c67 100644
> --- a/.gitlab-ci.d/cirrus.yml
> +++ b/.gitlab-ci.d/cirrus.yml
> @@ -30,17 +30,3 @@
>      - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml
>    variables:
>      QEMU_JOB_CIRRUS: 1
> -
> -x64-freebsd-14-build:
> -  extends: .cirrus_build_job
> -  variables:
> -    NAME: freebsd-14
> -    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
> -    CIRRUS_VM_IMAGE_SELECTOR: image_family
> -    CIRRUS_VM_IMAGE_NAME: freebsd-14-3
> -    CIRRUS_VM_CPUS: 8
> -    CIRRUS_VM_RAM: 8G
> -    UPDATE_COMMAND: pkg update; pkg upgrade -y
> -    INSTALL_COMMAND: pkg install -y
> -    CONFIGURE_ARGS:
> --target-list-exclude=arm-softmmu,i386-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu
> --enable-rust
> -    TEST_TARGETS: check
> diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars
> b/.gitlab-ci.d/cirrus/freebsd-14.vars
> deleted file mode 100644
> index 98fbde6cc6..0000000000
> --- a/.gitlab-ci.d/cirrus/freebsd-14.vars
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -#  $ lcitool variables freebsd-14 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci
> -
> -CCACHE='/usr/local/bin/ccache'
> -CPAN_PKGS=''
> -CROSS_PKGS=''
> -MAKE='/usr/local/bin/gmake'
> -NINJA='/usr/local/bin/ninja'
> -PACKAGING_COMMAND='pkg'
> -PIP3='/usr/local/bin/pip'
> -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka
> coreutils ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3
> gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1
> llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png
> py311-numpy py311-pillow py311-pip py311-pyyaml py311-setuptools
> py311-sphinx py311-sphinx_rtd_theme py311-tomli py311-wheel python3
> rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat
> spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso
> zstd'
> -PYPI_PKGS=''
> -PYTHON='/usr/local/bin/python3'
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 96ee861cbf..e903a33f7a 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -303,11 +303,6 @@ try:
>                          enable_rust=False,
>                          trailer="".join(debian_all_test_cross_compilers))
>
> -    #
> -    # Cirrus packages lists for GitLab
> -    #
> -    generate_cirrus("freebsd-14")
> -
>      #
>      # GitLab packages lists
>      #
> --
> 2.54.0
>
>

[-- Attachment #2: Type: text/html, Size: 5454 bytes --]

Re: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Alex Bennée]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
> macOS build job. The MAINTAINERS file now contains a stale path that
> should be removed.
>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4ff33eb630..0c0c8c0a37 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -701,7 +701,6 @@ F: scripts/nsis.py
>  Darwin (macOS, iOS)
>  M: Philippe Mathieu-Daudé <philmd@mailo.com>
>  S: Odd Fixes
> -F: .gitlab-ci.d/cirrus/macos-*
>  F: */*.m
>  F: scripts/entitlement.sh

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 2/3] lcitool: remove Cirrus CI support

[Alex Bennée]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> Remove GitLab CI integration for Cirrus CI now that nothing uses it
> anymore.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job

[Philippe Mathieu-Daudé]

On 2/6/26 18:24, Stefan Hajnoczi wrote:
> Cirrus has shut down and the x64-freebsd-14-build is failing:
> https://gitlab.com/qemu-project/qemu/-/jobs/14656732122
> 
> Remove the x64-freebsd-14-build job to get the CI pipeline passing
> again. The next commit will be to remove Cirrus integration from the
> GitLab YAML and lcitool since it is no longer used.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   MAINTAINERS                         |  2 --
>   .gitlab-ci.d/cirrus.yml             | 14 --------------
>   .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ----------------
>   tests/lcitool/refresh               |  5 -----
>   4 files changed, 37 deletions(-)
>   delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7752917d8c..4ff33eb630 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4511,9 +4511,7 @@ W: https://travis-ci.org/qemu/qemu
>   FreeBSD Hosted Continuous Integration
>   M: Li-Wen Hsu <lwhsu@freebsd.org>
>   S: Maintained

This raise the question, is it still maintained?

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

> -F: .gitlab-ci.d/cirrus/freebsd*
>   F: tests/vm/freebsd
> -W: https://cirrus-ci.com/github/qemu/qemu

Re: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Philippe Mathieu-Daudé]

On 2/6/26 18:24, Stefan Hajnoczi wrote:
> Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
> macOS build job. The MAINTAINERS file now contains a stale path that
> should be removed.
> 
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   MAINTAINERS | 1 -
>   1 file changed, 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

Re: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Markus Armbruster]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
> macOS build job. The MAINTAINERS file now contains a stale path that
> should be removed.
>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4ff33eb630..0c0c8c0a37 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -701,7 +701,6 @@ F: scripts/nsis.py
>  Darwin (macOS, iOS)
>  M: Philippe Mathieu-Daudé <philmd@mailo.com>
>  S: Odd Fixes
> -F: .gitlab-ci.d/cirrus/macos-*

We also need

  +F: .gitlab-ci.d/macos*

>  F: */*.m
>  F: scripts/entitlement.sh

I posted this as

    Subject: [PATCH v2 10/38] MAINTAINERS: Fix F: in "Darwin (macOS, iOS)"
    Date: Wed, 3 Jun 2026 08:40:04 +0200
    Message-ID: <20260603064032.3733394-11-armbru@redhat.com>

I wasn't aware of your patch until Philippe pointed it out to me in his
review of mine.

Re: [PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job

[Stefan Hajnoczi]

On Wed, Jun 3, 2026 at 3:09 AM Philippe Mathieu-Daudé <philmd@mailo.com> wrote:
>
> On 2/6/26 18:24, Stefan Hajnoczi wrote:
> > Cirrus has shut down and the x64-freebsd-14-build is failing:
> > https://gitlab.com/qemu-project/qemu/-/jobs/14656732122
> >
> > Remove the x64-freebsd-14-build job to get the CI pipeline passing
> > again. The next commit will be to remove Cirrus integration from the
> > GitLab YAML and lcitool since it is no longer used.
> >
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> >   MAINTAINERS                         |  2 --
> >   .gitlab-ci.d/cirrus.yml             | 14 --------------
> >   .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ----------------
> >   tests/lcitool/refresh               |  5 -----
> >   4 files changed, 37 deletions(-)
> >   delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 7752917d8c..4ff33eb630 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -4511,9 +4511,7 @@ W: https://travis-ci.org/qemu/qemu
> >   FreeBSD Hosted Continuous Integration
> >   M: Li-Wen Hsu <lwhsu@freebsd.org>
> >   S: Maintained
>
> This raise the question, is it still maintained?

I left this section because Warner is working on bringing up a FreeBSD
build VM and corresponding a GitLab CI YAML file in qemu.git to run
builds. Warner can add the path to the new YAML file and add himself
as a maintainer in his patch series.

Stefan

Re: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path

[Stefan Hajnoczi]

On Wed, Jun 3, 2026 at 5:52 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> Stefan Hajnoczi <stefanha@redhat.com> writes:
>
> > Commit 984b192bdf37 ("ci: drop cirrus MacOS build") removed the Cirrus
> > macOS build job. The MAINTAINERS file now contains a stale path that
> > should be removed.
> >
> > Cc: Alex Bennée <alex.bennee@linaro.org>
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> >  MAINTAINERS | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 4ff33eb630..0c0c8c0a37 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -701,7 +701,6 @@ F: scripts/nsis.py
> >  Darwin (macOS, iOS)
> >  M: Philippe Mathieu-Daudé <philmd@mailo.com>
> >  S: Odd Fixes
> > -F: .gitlab-ci.d/cirrus/macos-*
>
> We also need
>
>   +F: .gitlab-ci.d/macos*
>
> >  F: */*.m
> >  F: scripts/entitlement.sh
>
> I posted this as
>
>     Subject: [PATCH v2 10/38] MAINTAINERS: Fix F: in "Darwin (macOS, iOS)"
>     Date: Wed, 3 Jun 2026 08:40:04 +0200
>     Message-ID: <20260603064032.3733394-11-armbru@redhat.com>
>
> I wasn't aware of your patch until Philippe pointed it out to me in his
> review of mine.

Your patch is better, thanks. I request that the .gitlab-ci.d/
maintainers drop this patch from my series when merging.

Stefan

Re: [PATCH 0/3] gitlab: remove x64-freebsd-14-build job and Cirrus CI integration

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]

On Tue, Jun 02, 2026 at 12:24:53PM -0400, Stefan Hajnoczi wrote:
> Cirrus CI shut down yesterday and the x64-freebsd-14-build CI job is now
> failing. This patch series removes the job as well as the Cirrus CI integration
> in lcitool.
> 
> Warner is setting up a gitlab-runner on a VM hosted by OSUOSL for QEMU. It will
> be possible to test FreeBSD builds again when it comes online.
> 
> Stefan Hajnoczi (3):
>   gitlab: remove x64-freebsd-14-build Cirrus job
>   lcitool: remove Cirrus CI support
>   MAINTAINERS: remove stale Cirrus macOS build job path
> 
>  MAINTAINERS                         |  3 --
>  .gitlab-ci.d/cirrus/README.rst      | 54 -----------------------------
>  docs/devel/testing/main.rst         |  4 +--
>  .gitlab-ci.d/base.yml               |  4 ---
>  .gitlab-ci.d/cirrus.yml             | 46 ------------------------
>  .gitlab-ci.d/cirrus/build.yml       | 42 ----------------------
>  .gitlab-ci.d/cirrus/freebsd-14.vars | 16 ---------
>  .gitlab-ci.d/qemu-project.yml       |  1 -
>  docs/devel/testing/ci-jobs.rst.inc  |  6 ----
>  tests/lcitool/refresh               | 11 ------
>  10 files changed, 2 insertions(+), 185 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/README.rst
>  delete mode 100644 .gitlab-ci.d/cirrus.yml
>  delete mode 100644 .gitlab-ci.d/cirrus/build.yml
>  delete mode 100644 .gitlab-ci.d/cirrus/freebsd-14.vars
> 
> -- 
> 2.54.0
> 

Alex and Pierrick gave their R-b, so I guess this is not going through
their trees.

Applied to the staging tree to make CI green again but without the final
MAINTAINERS patch (Markus has a patch that obsoletes mine):
https://gitlab.com/qemu-project/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]