From nobody Mon Jun 8 04:26:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780417545; cv=none; d=zohomail.com; s=zohoarc; b=kUKMC74HS/9PxyCtOBxNWZUBX2Ib+ox0GKjk70tUQKcpnWwTLfMPv5Y8skDCxt10O+YKOkIRJBr7yFipwzLhm684qXto/pFPDUkjbH0IxsWqhZcvpZ1FaYxWNKEZNgmlcICGL9veziRkaEruqXglo65TJTB6i+cxRwLJegWsavk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780417545; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6t5M6S4Movqjkg+/i/MtzJrUIubVGOlbnkRMufktihc=; b=Bpq/e2uDVfKKeircTi4h+aP+m5H3kn4KgCxeg/z2euVJMjyOKyXiH2txvWwD2ii2ItrpQRlj4FyRTnnoW/N208Ocn27evRisLReDZ+x0RJo6tWpe3t8mBGep3kysZfalR0TjiRe3VSdwnLTRVIxSfquasWoHoBvDMuNFGwTe7YE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780417545066870.9638871890556; Tue, 2 Jun 2026 09:25:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wURva-0004tm-PK; Tue, 02 Jun 2026 12:25:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvT-0004ra-GD for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvR-0001N0-Gf for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:11 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-15n8lkekPpePGU5eDVbhZg-1; Tue, 02 Jun 2026 12:25:02 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6306C1956096; Tue, 2 Jun 2026 16:25:01 +0000 (UTC) Received: from localhost (unknown [10.2.16.102]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8EBB318004A3; Tue, 2 Jun 2026 16:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780417507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6t5M6S4Movqjkg+/i/MtzJrUIubVGOlbnkRMufktihc=; b=heglr0X0emut6PwpGL7hh/pw8+C39whJuZhx/LMC/Jy+j8Pr0PRDX6mWHdc4LFOr4MVlrP GWsa8O8QEB31U79ZFzE9TYYMd0DTCMHFPGfrvwlH+649jna6SWA2jnJOFFfdkww+9orsci Z5aqyzbgGOePqrnsGD/mooXsREOLlSo= X-MC-Unique: 15n8lkekPpePGU5eDVbhZg-1 X-Mimecast-MFC-AGG-ID: 15n8lkekPpePGU5eDVbhZg_1780417501 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Stefan Hajnoczi Subject: [PATCH 1/3] gitlab: remove x64-freebsd-14-build Cirrus job Date: Tue, 2 Jun 2026 12:24:54 -0400 Message-ID: <20260602162457.828969-2-stefanha@redhat.com> In-Reply-To: <20260602162457.828969-1-stefanha@redhat.com> References: <20260602162457.828969-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1780417547193154100 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Warner Losh --- 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 S: Maintained -F: .gitlab-ci.d/cirrus/freebsd* F: tests/vm/freebsd -W: https://cirrus-ci.com/github/qemu/qemu =20 Functional testing framework M: Thomas Huth 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=3Darm-softmmu,i386-softmmu,mips6= 4el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-so= ftmmu --enable-rust - TEST_TARGETS: check diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars b/.gitlab-ci.d/cirrus/free= bsd-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=3D'/usr/local/bin/ccache' -CPAN_PKGS=3D'' -CROSS_PKGS=3D'' -MAKE=3D'/usr/local/bin/gmake' -NINJA=3D'/usr/local/bin/ninja' -PACKAGING_COMMAND=3D'pkg' -PIP3=3D'/usr/local/bin/pip' -PKGS=3D'alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka cor= eutils ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext g= it glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt lib= jpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson = mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pil= low py311-pip py311-pyyaml py311-setuptools py311-sphinx py311-sphinx_rtd_t= heme py311-tomli py311-wheel python3 rpm2cpio rust rust-bindgen-cli sdl2 sd= l2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer= vte3 vulkan-tools xorriso zstd' -PYPI_PKGS=3D'' -PYTHON=3D'/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=3DFalse, trailer=3D"".join(debian_all_test_cross_compilers)) =20 - # - # Cirrus packages lists for GitLab - # - generate_cirrus("freebsd-14") - # # GitLab packages lists # --=20 2.54.0 From nobody Mon Jun 8 04:26:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780417554; cv=none; d=zohomail.com; s=zohoarc; b=BxFGJz8gOJ0AmXoiy+ywHAZkyPBTwrpk5X93OLb2KljNG+UAijBLDtGUMMPfykNko0wLryw5pDFUUNLE4lwyfJaJR/uZW/9A4xkqT0rLxisBw/hCTu6I7QjJvbqt9geRPKQ1VjJgtSiPmeL4Pmo6MManMOBXRTSfJNG0D5xMuYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780417554; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RHf2jrK0TMUhvLaAP8L2IdURLJ9Pl/1Hv8X/zR+6Htw=; b=NxF7a8T84ESTfGlh+KXuFQ++znCSI8kTE085aUlME56tYQ5wTL4xL4KJfsw7WqreSHpEyeGbCX+2MpntGOiZD9cxLdW59Spc1GMmhna1bOunEoWSbDtZFGP1hc4WObYiJsidt+afn0DdWyebmVzlcpoiUp/Rh9XcV7Rv1psAOw4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780417554727277.4894559359101; Tue, 2 Jun 2026 09:25:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wURvl-0004w4-Np; Tue, 02 Jun 2026 12:25:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvV-0004sB-5Z for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvR-0001NC-Ma for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:12 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-271-OMOynMXXPOygAeJY_w7Tjw-1; Tue, 02 Jun 2026 12:25:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 22C9418002D7; Tue, 2 Jun 2026 16:25:03 +0000 (UTC) Received: from localhost (unknown [10.2.16.102]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CCCED18004A3; Tue, 2 Jun 2026 16:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780417507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RHf2jrK0TMUhvLaAP8L2IdURLJ9Pl/1Hv8X/zR+6Htw=; b=PINEjVs7W6e1U6nk9ju8pZ6PAvTUUwA9SyCTjdovCHwNLkqvgstUQEH8yc/0BcF+csEPfE /SB8hrovDxne+mSI0+Q4dbzTXo2oBRGFowKTLb41JfnlF4oNZDA7gvWGLWBdE2FtHTjl4f ldVYf7Iqs1qaXQLmZWQ6E3PWBG87jQA= X-MC-Unique: OMOynMXXPOygAeJY_w7Tjw-1 X-Mimecast-MFC-AGG-ID: OMOynMXXPOygAeJY_w7Tjw_1780417503 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Stefan Hajnoczi Subject: [PATCH 2/3] lcitool: remove Cirrus CI support Date: Tue, 2 Jun 2026 12:24:55 -0400 Message-ID: <20260602162457.828969-3-stefanha@redhat.com> In-Reply-To: <20260602162457.828969-1-stefanha@redhat.com> References: <20260602162457.828969-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1780417557062158500 Content-Type: text/plain; charset="utf-8" Remove GitLab CI integration for Cirrus CI now that nothing uses it anymore. Signed-off-by: Stefan Hajnoczi Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Reviewed-by: Warner Losh --- .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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -GitLab CI shared runners only provide a docker environment running on Linu= x. -While it is possible to provide private runners for non-Linux platforms th= is -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 Ci= rrus -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 m= acOS -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 ne= ed 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 Gi= tHub - 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 ear= lier. - This variable **must** be marked as *Masked*, because anyone with know= ledge - 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-prot= ected - branches. - -Once this one-time setup is complete, you can just keep pushing to your Gi= tLab -repository as usual and you'll automatically get the additional CI coverag= e. - - -.. _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 varie= ty 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. =20 =20 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 =3D=3D "schedule"' when: never =20 - # Cirrus jobs can't run unless the creds / target repo are set - - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO =3D=3D null || $CIRRUS= _API_TOKEN =3D=3D null)' - when: never - # Publishing jobs should only run on the default branch in upstream - if: '$QEMU_JOB_PUBLISH =3D=3D "1" && $CI_PROJECT_NAMESPACE =3D=3D $Q= EMU_CI_UPSTREAM && $CI_COMMIT_BRANCH !=3D $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/$NAM= E.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=3D$(@PYTHON@ -c 'import syscon= fig; 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=3D1 ; - 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-job= s.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. =20 -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 ~~~~~~~~~~~~~~~~~ =20 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=3D"qemu", = cross=3DNone, trailer=3DNone, generate(filename, cmd, trailer) =20 =20 -def generate_cirrus(target, trailer=3DNone): - filename =3D Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd =3D lcitool_cmd + ["variables", "--format", "shell", target, "qemu= "] - generate(filename, cmd, trailer) - - def generate_vars(target, trailer=3DNone): filename =3D Path(src_dir, ".gitlab-ci.d", target + ".vars") cmd =3D lcitool_cmd + ["variables", "--format", "shell", target, "qemu= "] --=20 2.54.0 From nobody Mon Jun 8 04:26:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780417568; cv=none; d=zohomail.com; s=zohoarc; b=gmqJYkp8D8Qqor/yzfwyqJc3fPoVIu1HabKy4P+7XwlMbCOiVtDyPzkjKl3dgNPpb/qrfCAeP4Jb+b/4IKOmpIJ+Isui6zzSSa723yAtitymsbCB2gb0ryZaGJnaJP9gQULeJibMIvSKnEIWvcnmNMBuoqSOJiOaV7vT2Xnswhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780417568; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sD0SN6NAM3daWSCUJJeIiPVp6OA9pfxET2yDPHwlyBo=; b=i7FZTDxX/WMvbB8OlYJFTcgCbr9eSC8Kp/qptvvn2pm+OlB4f9ZidUJviuEIgn0g3pKOa1zV5RoIJC4ZxqaVzevbQbTMBELPyJJjfn4k1XVDBPuPpYXAQT2rJF0OY5gkp8pGupPYNhCWPWrMxBbVHqLLXYwXCG3f63MkxL0/opo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780417568622423.303559432891; Tue, 2 Jun 2026 09:26:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wURvd-0004u7-Lo; Tue, 02 Jun 2026 12:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvV-0004sL-Rh for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wURvS-0001Yp-RS for qemu-devel@nongnu.org; Tue, 02 Jun 2026 12:25:13 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-nddcfiHpPQelsoTw0xos4g-1; Tue, 02 Jun 2026 12:25:06 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 057AF19560A1; Tue, 2 Jun 2026 16:25:05 +0000 (UTC) Received: from localhost (unknown [10.2.16.102]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 41F421681; Tue, 2 Jun 2026 16:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780417510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sD0SN6NAM3daWSCUJJeIiPVp6OA9pfxET2yDPHwlyBo=; b=WVjBDnn3pUT4nMYGo8QbpuV6++pIes9ZijU3L1KCR4HYY7VuDpRIho+WCrBa2L8xTfKjph ssIrD+VkzXWuF5I4azdCZVhcHhljbYKykRXyrVFTWKQRw+pGX+LN4aBDp9jhIpqvJmy8Zf IaO7dFs2zU5+ku7HLr52cfOf5Bba+lk= X-MC-Unique: nddcfiHpPQelsoTw0xos4g-1 X-Mimecast-MFC-AGG-ID: nddcfiHpPQelsoTw0xos4g_1780417505 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Stefan Hajnoczi Subject: [PATCH 3/3] MAINTAINERS: remove stale Cirrus macOS build job path Date: Tue, 2 Jun 2026 12:24:56 -0400 Message-ID: <20260602162457.828969-4-stefanha@redhat.com> In-Reply-To: <20260602162457.828969-1-stefanha@redhat.com> References: <20260602162457.828969-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1780417571165158500 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=C3=A9e Signed-off-by: Stefan Hajnoczi Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- 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=C3=A9 S: Odd Fixes -F: .gitlab-ci.d/cirrus/macos-* F: */*.m F: scripts/entitlement.sh =20 --=20 2.54.0