From nobody Thu Jun 4 19:51:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1780385309; cv=none; d=zohomail.com; s=zohoarc; b=QdhM6nkRrVSH7hEqhOLvHM/ZgNmEb/Di/3TVL8Y7zQsyHKTGAfTzYgmDAU+qIy4xXhH5DwvssG4kGsAzcpTkThIsWIkHW69rSxejJiKFDSMKAnTtRRIrT1jpZD/TgPL7matGBebQXFJvnHmKNpVTgqAeeTiIjQcmo5HSeCrCMH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780385309; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=npSy78tD0P7FX6/uMTllZeYcDrXYm47NqpnA1QykCYI=; b=LABrDvYxD5GJJyJ2A7mcKoSEGvg0vBHrgaJcOjjvlpZlnvy1thXl0b7SgSYBO0r26YV++dHz6J1PXlXpmBVwnUtXanGWg5NGtnBROzz+iTuB0gcL2Z/b8asXYdSKRoL2m1coIfQlz+VUj+ThLffcCfksjfrnXz9OvjGLjfMGEeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1780385308967423.23692303096914; Tue, 2 Jun 2026 00:28:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D63FE3F95F; Tue, 2 Jun 2026 03:28:27 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 458A141D42; Tue, 2 Jun 2026 03:17:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E1A7B41A7F; Tue, 2 Jun 2026 03:17:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 50ABC4187A for ; Tue, 2 Jun 2026 03:17:09 -0400 (EDT) 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-461-23WqVJupOBmX2b4wJ0dgxw-1; Tue, 02 Jun 2026 03:17: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 2826F19560AA for ; Tue, 2 Jun 2026 07:17:06 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3040A1685 for ; Tue, 2 Jun 2026 07:17:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780384628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=npSy78tD0P7FX6/uMTllZeYcDrXYm47NqpnA1QykCYI=; b=AbrqgzWXbyV74u6Ih6jjQuGi+8yupdEvRU1ObpatzNREbJri1gAPxHG6uzns4YgFiNqiG4 nQQckUwr8HMMU/yrMLzkPwpOA7ItZSMzGYYxJLqM1I7ryrqaBBL6kcu000gELARUXxjs8v dIiuOJqZF4uBBcBv0tsal0fcC179RYA= X-MC-Unique: 23WqVJupOBmX2b4wJ0dgxw-1 X-Mimecast-MFC-AGG-ID: 23WqVJupOBmX2b4wJ0dgxw_1780384626 To: devel@lists.libvirt.org Subject: [PATCH 1/2] ci: regenerate with 'lcitool manifest' Date: Tue, 2 Jun 2026 09:16:57 +0200 Message-ID: <623f080e67ddef5977f3c2039d0b5c6037bef68a.1780384242.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ffgmdRgx9IXomAtrHGW0M6nHFVeC54qBf_F-yd9UL6M_1780384626 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6YCK7BWJOUFTVMIXY5QF6HTN7PLXOUDN X-Message-ID-Hash: 6YCK7BWJOUFTVMIXY5QF6HTN7PLXOUDN X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1780385310842154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik This drops Debian 12 and introduces Debian 13, since Debian 12 reached its EOL on 2026-06-10 [1]. However, Debian 13 dropped official support for mipsel and mips64el, but introduced riscv64 support. Reflect this changes in supported arches in the manifest file and regenerate with the latest lcitool. 1: https://www.debian.org/releases/ Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- ci/buildenv/debian-12-cross-mips64el.sh | 109 --------------- ci/buildenv/debian-12-cross-mipsel.sh | 109 --------------- ...-aarch64.sh =3D> debian-13-cross-aarch64.sh} | 0 ...ss-armv6l.sh =3D> debian-13-cross-armv6l.sh} | 2 - ...ss-armv7l.sh =3D> debian-13-cross-armv7l.sh} | 3 - ...-cross-i686.sh =3D> debian-13-cross-i686.sh} | 2 - ...-ppc64le.sh =3D> debian-13-cross-ppc64le.sh} | 0 ci/buildenv/debian-13-cross-riscv64.sh | 109 +++++++++++++++ ...ross-s390x.sh =3D> debian-13-cross-s390x.sh} | 0 ci/buildenv/{debian-12.sh =3D> debian-13.sh} | 0 ci/buildenv/debian-sid-cross-mips64el.sh | 109 --------------- ci/buildenv/debian-sid-cross-riscv64.sh | 109 +++++++++++++++ .../debian-12-cross-mips64el.Dockerfile | 115 ---------------- .../debian-12-cross-mipsel.Dockerfile | 115 ---------------- ...ile =3D> debian-13-cross-aarch64.Dockerfile} | 2 +- ...file =3D> debian-13-cross-armv6l.Dockerfile} | 4 +- ...file =3D> debian-13-cross-armv7l.Dockerfile} | 5 +- ...erfile =3D> debian-13-cross-i686.Dockerfile} | 4 +- ...ile =3D> debian-13-cross-ppc64le.Dockerfile} | 2 +- .../debian-13-cross-riscv64.Dockerfile | 115 ++++++++++++++++ ...rfile =3D> debian-13-cross-s390x.Dockerfile} | 2 +- ...ian-12.Dockerfile =3D> debian-13.Dockerfile} | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 115 ---------------- .../debian-sid-cross-riscv64.Dockerfile | 115 ++++++++++++++++ ci/gitlab/builds.yml | 129 ++++++++---------- ci/gitlab/containers.yml | 56 ++++---- ci/manifest.yml | 18 +-- 27 files changed, 544 insertions(+), 807 deletions(-) delete mode 100644 ci/buildenv/debian-12-cross-mips64el.sh delete mode 100644 ci/buildenv/debian-12-cross-mipsel.sh rename ci/buildenv/{debian-12-cross-aarch64.sh =3D> debian-13-cross-aarch6= 4.sh} (100%) rename ci/buildenv/{debian-12-cross-armv6l.sh =3D> debian-13-cross-armv6l.= sh} (98%) rename ci/buildenv/{debian-12-cross-armv7l.sh =3D> debian-13-cross-armv7l.= sh} (97%) rename ci/buildenv/{debian-12-cross-i686.sh =3D> debian-13-cross-i686.sh} = (98%) rename ci/buildenv/{debian-12-cross-ppc64le.sh =3D> debian-13-cross-ppc64l= e.sh} (100%) create mode 100644 ci/buildenv/debian-13-cross-riscv64.sh rename ci/buildenv/{debian-12-cross-s390x.sh =3D> debian-13-cross-s390x.sh= } (100%) rename ci/buildenv/{debian-12.sh =3D> debian-13.sh} (100%) delete mode 100644 ci/buildenv/debian-sid-cross-mips64el.sh create mode 100644 ci/buildenv/debian-sid-cross-riscv64.sh delete mode 100644 ci/containers/debian-12-cross-mips64el.Dockerfile delete mode 100644 ci/containers/debian-12-cross-mipsel.Dockerfile rename ci/containers/{debian-12-cross-aarch64.Dockerfile =3D> debian-13-cr= oss-aarch64.Dockerfile} (99%) rename ci/containers/{debian-12-cross-armv6l.Dockerfile =3D> debian-13-cro= ss-armv6l.Dockerfile} (97%) rename ci/containers/{debian-12-cross-armv7l.Dockerfile =3D> debian-13-cro= ss-armv7l.Dockerfile} (96%) rename ci/containers/{debian-12-cross-i686.Dockerfile =3D> debian-13-cross= -i686.Dockerfile} (97%) rename ci/containers/{debian-12-cross-ppc64le.Dockerfile =3D> debian-13-cr= oss-ppc64le.Dockerfile} (99%) create mode 100644 ci/containers/debian-13-cross-riscv64.Dockerfile rename ci/containers/{debian-12-cross-s390x.Dockerfile =3D> debian-13-cros= s-s390x.Dockerfile} (99%) rename ci/containers/{debian-12.Dockerfile =3D> debian-13.Dockerfile} (98%) delete mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-sid-cross-riscv64.Dockerfile diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-1= 2-cross-mips64el.sh deleted file mode 100644 index a126accfd4..0000000000 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=3Dnoninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=3Dnoninteractive - dpkg --add-architecture mips64el - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips64'\n\ -cpu =3D 'mips64el'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc -} - -export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -export LANG=3D"en_US.UTF-8" -export MAKE=3D"/usr/bin/make" -export NINJA=3D"/usr/bin/ninja" -export PYTHON=3D"/usr/bin/python3" - -export ABI=3D"mips64el-linux-gnuabi64" -export MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-= cross-mipsel.sh deleted file mode 100644 index 562bb3e2f1..0000000000 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=3Dnoninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=3Dnoninteractive - dpkg --add-architecture mipsel - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse3-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libjson-c-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - systemtap-sdt-dev:mipsel - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips'\n\ -cpu =3D 'mipsel'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -} - -export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -export LANG=3D"en_US.UTF-8" -export MAKE=3D"/usr/bin/make" -export NINJA=3D"/usr/bin/ninja" -export PYTHON=3D"/usr/bin/python3" - -export ABI=3D"mipsel-linux-gnu" -export MESON_OPTS=3D"--cross-file=3Dmipsel-linux-gnu" diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-13= -cross-aarch64.sh similarity index 100% rename from ci/buildenv/debian-12-cross-aarch64.sh rename to ci/buildenv/debian-13-cross-aarch64.sh diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-13-= cross-armv6l.sh similarity index 98% rename from ci/buildenv/debian-12-cross-armv6l.sh rename to ci/buildenv/debian-13-cross-armv6l.sh index 5520e88be7..cad3f59aca 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-13-cross-armv6l.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:armel \ libfuse3-dev:armel \ libglib2.0-dev:armel \ - libglusterfs-dev:armel \ libgnutls28-dev:armel \ libiscsi-dev:armel \ libjson-c-dev:armel \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-13-= cross-armv7l.sh similarity index 97% rename from ci/buildenv/debian-12-cross-armv7l.sh rename to ci/buildenv/debian-13-cross-armv7l.sh index 5311e4ab72..87a93b1866 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-13-cross-armv7l.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:armhf \ libfuse3-dev:armhf \ libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ libgnutls28-dev:armhf \ libiscsi-dev:armhf \ libjson-c-dev:armhf \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ @@ -79,7 +77,6 @@ function install_buildenv() { libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ - libxen-dev:armhf \ libxml2-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-13-cr= oss-i686.sh similarity index 98% rename from ci/buildenv/debian-12-cross-i686.sh rename to ci/buildenv/debian-13-cross-i686.sh index fcda471378..729f32540a 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-13-cross-i686.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:i386 \ libfuse3-dev:i386 \ libglib2.0-dev:i386 \ - libglusterfs-dev:i386 \ libgnutls28-dev:i386 \ libiscsi-dev:i386 \ libjson-c-dev:i386 \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-13= -cross-ppc64le.sh similarity index 100% rename from ci/buildenv/debian-12-cross-ppc64le.sh rename to ci/buildenv/debian-13-cross-ppc64le.sh diff --git a/ci/buildenv/debian-13-cross-riscv64.sh b/ci/buildenv/debian-13= -cross-riscv64.sh new file mode 100644 index 0000000000..7e1cc85ffe --- /dev/null +++ b/ci/buildenv/debian-13-cross-riscv64.sh @@ -0,0 +1,109 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=3Dnoninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + export DEBIAN_FRONTEND=3Dnoninteractive + dpkg --add-architecture riscv64 + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y dpkg-dev + apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 + mkdir -p /usr/local/share/meson/cross + printf "[binaries]\n\ +c =3D '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'riscv64'\n\ +cpu =3D 'riscv64'\n\ +endian =3D 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g= cc +} + +export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +export LANG=3D"en_US.UTF-8" +export MAKE=3D"/usr/bin/make" +export NINJA=3D"/usr/bin/ninja" +export PYTHON=3D"/usr/bin/python3" + +export ABI=3D"riscv64-linux-gnu" +export MESON_OPTS=3D"--cross-file=3Driscv64-linux-gnu" diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-13-c= ross-s390x.sh similarity index 100% rename from ci/buildenv/debian-12-cross-s390x.sh rename to ci/buildenv/debian-13-cross-s390x.sh diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-13.sh similarity index 100% rename from ci/buildenv/debian-12.sh rename to ci/buildenv/debian-13.sh diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-= sid-cross-mips64el.sh deleted file mode 100644 index a126accfd4..0000000000 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=3Dnoninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=3Dnoninteractive - dpkg --add-architecture mips64el - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips64'\n\ -cpu =3D 'mips64el'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc -} - -export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -export LANG=3D"en_US.UTF-8" -export MAKE=3D"/usr/bin/make" -export NINJA=3D"/usr/bin/ninja" -export PYTHON=3D"/usr/bin/python3" - -export ABI=3D"mips64el-linux-gnuabi64" -export MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/buildenv/debian-sid-cross-riscv64.sh b/ci/buildenv/debian-s= id-cross-riscv64.sh new file mode 100644 index 0000000000..7e1cc85ffe --- /dev/null +++ b/ci/buildenv/debian-sid-cross-riscv64.sh @@ -0,0 +1,109 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=3Dnoninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + export DEBIAN_FRONTEND=3Dnoninteractive + dpkg --add-architecture riscv64 + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y dpkg-dev + apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 + mkdir -p /usr/local/share/meson/cross + printf "[binaries]\n\ +c =3D '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'riscv64'\n\ +cpu =3D 'riscv64'\n\ +endian =3D 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g= cc +} + +export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +export LANG=3D"en_US.UTF-8" +export MAKE=3D"/usr/bin/make" +export NINJA=3D"/usr/bin/ninja" +export PYTHON=3D"/usr/bin/python3" + +export ABI=3D"riscv64-linux-gnu" +export MESON_OPTS=3D"--cross-file=3Driscv64-linux-gnu" diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/contain= ers/debian-12-cross-mips64el.Dockerfile deleted file mode 100644 index 51abdb4469..0000000000 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -ENV LANG=3D"en_US.UTF-8" -ENV MAKE=3D"/usr/bin/make" -ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips64'\n\ -cpu =3D 'mips64el'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc - -ENV ABI=3D"mips64el-linux-gnuabi64" -ENV MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/container= s/debian-12-cross-mipsel.Dockerfile deleted file mode 100644 index 09c115b460..0000000000 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -ENV LANG=3D"en_US.UTF-8" -ENV MAKE=3D"/usr/bin/make" -ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse3-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libjson-c-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - systemtap-sdt-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips'\n\ -cpu =3D 'mipsel'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI=3D"mipsel-linux-gnu" -ENV MESON_OPTS=3D"--cross-file=3Dmipsel-linux-gnu" diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containe= rs/debian-13-cross-aarch64.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-aarch64.Dockerfile rename to ci/containers/debian-13-cross-aarch64.Dockerfile index 88253a89dc..6293715d29 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-13-cross-aarch64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/container= s/debian-13-cross-armv6l.Dockerfile similarity index 97% rename from ci/containers/debian-12-cross-armv6l.Dockerfile rename to ci/containers/debian-13-cross-armv6l.Dockerfile index dfb48adb78..8c54391915 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-13-cross-armv6l.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libdevmapper-dev:armel \ libfuse3-dev:armel \ libglib2.0-dev:armel \ - libglusterfs-dev:armel \ libgnutls28-dev:armel \ libiscsi-dev:armel \ libjson-c-dev:armel \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/container= s/debian-13-cross-armv7l.Dockerfile similarity index 96% rename from ci/containers/debian-12-cross-armv7l.Dockerfile rename to ci/containers/debian-13-cross-armv7l.Dockerfile index b70f2475c1..fd54af8649 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-13-cross-armv7l.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libdevmapper-dev:armhf \ libfuse3-dev:armhf \ libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ libgnutls28-dev:armhf \ libiscsi-dev:armhf \ libjson-c-dev:armhf \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ @@ -90,7 +88,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ - libxen-dev:armhf \ libxml2-dev:armhf \ systemtap-sdt-dev:armhf && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/= debian-13-cross-i686.Dockerfile similarity index 97% rename from ci/containers/debian-12-cross-i686.Dockerfile rename to ci/containers/debian-13-cross-i686.Dockerfile index 863d2849fc..3cb098e30f 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-13-cross-i686.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libdevmapper-dev:i386 \ libfuse3-dev:i386 \ libglib2.0-dev:i386 \ - libglusterfs-dev:i386 \ libgnutls28-dev:i386 \ libiscsi-dev:i386 \ libjson-c-dev:i386 \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-13-cross-ppc64le.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-ppc64le.Dockerfile rename to ci/containers/debian-13-cross-ppc64le.Dockerfile index aa12740271..e18dcc9356 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-13-cross-ppc64le.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-13-cross-riscv64.Dockerfile b/ci/containe= rs/debian-13-cross-riscv64.Dockerfile new file mode 100644 index 0000000000..1901c8996c --- /dev/null +++ b/ci/containers/debian-13-cross-riscv64.Dockerfile @@ -0,0 +1,115 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:13-slim + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c =3D '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'riscv64'\n\ +cpu =3D 'riscv64'\n\ +endian =3D 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu &&= \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c= c && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g= cc + +ENV ABI=3D"riscv64-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Driscv64-linux-gnu" diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers= /debian-13-cross-s390x.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-s390x.Dockerfile rename to ci/containers/debian-13-cross-s390x.Dockerfile index 4ffa2c4591..99f55321b6 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-13-cross-s390x.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-13.D= ockerfile similarity index 98% rename from ci/containers/debian-12.Dockerfile rename to ci/containers/debian-13.Dockerfile index e5ab0f2a3b..c07fd4fac1 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-13.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile deleted file mode 100644 index cc8924daa5..0000000000 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:sid-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -ENV LANG=3D"en_US.UTF-8" -ENV MAKE=3D"/usr/bin/make" -ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips64'\n\ -cpu =3D 'mips64el'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc - -ENV ABI=3D"mips64el-linux-gnuabi64" -ENV MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" diff --git a/ci/containers/debian-sid-cross-riscv64.Dockerfile b/ci/contain= ers/debian-sid-cross-riscv64.Dockerfile new file mode 100644 index 0000000000..77ca513dfd --- /dev/null +++ b/ci/containers/debian-sid-cross-riscv64.Dockerfile @@ -0,0 +1,115 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:sid-slim + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c =3D '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'riscv64'\n\ +cpu =3D 'riscv64'\n\ +endian =3D 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu &&= \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c= c && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g= cc + +ENV ABI=3D"riscv64-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Driscv64-linux-gnu" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index d215b23b7d..69c1047243 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -111,26 +111,26 @@ x86_64-centos-stream-10: - libvirt-rpms =20 =20 -x86_64-debian-12: +x86_64-debian-13: extends: .native_build_job needs: - - job: x86_64-debian-12-container + - job: x86_64-debian-13-container optional: true allow_failure: false variables: - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -x86_64-debian-12-clang: +x86_64-debian-13-clang: extends: .native_build_job needs: - - job: x86_64-debian-12-container + - job: x86_64-debian-13-container optional: true allow_failure: false variables: - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 x86_64-debian-sid: @@ -263,107 +263,94 @@ x86_64-ubuntu-2604-clang: =20 # Cross build jobs =20 -aarch64-debian-12: +aarch64-debian-13: extends: .cross_build_job needs: - - job: aarch64-debian-12-container + - job: aarch64-debian-13-container optional: true allow_failure: false variables: CROSS: aarch64 JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -armv6l-debian-12: +armv6l-debian-13: extends: .cross_build_job needs: - - job: armv6l-debian-12-container + - job: armv6l-debian-13-container optional: true allow_failure: false variables: CROSS: armv6l JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -armv7l-debian-12: +armv7l-debian-13: extends: .cross_build_job needs: - - job: armv7l-debian-12-container + - job: armv7l-debian-13-container optional: true allow_failure: false variables: CROSS: armv7l - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -i686-debian-12: +i686-debian-13: extends: .cross_build_job needs: - - job: i686-debian-12-container + - job: i686-debian-13-container optional: true allow_failure: false variables: CROSS: i686 JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -mips64el-debian-12: +ppc64le-debian-13: extends: .cross_build_job needs: - - job: mips64el-debian-12-container - optional: true - allow_failure: false - variables: - CROSS: mips64el - JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim - - -mipsel-debian-12: - extends: .cross_build_job - needs: - - job: mipsel-debian-12-container - optional: true - allow_failure: false - variables: - CROSS: mipsel - JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim - - -ppc64le-debian-12: - extends: .cross_build_job - needs: - - job: ppc64le-debian-12-container + - job: ppc64le-debian-13-container optional: true allow_failure: false variables: CROSS: ppc64le JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 -s390x-debian-12: +riscv64-debian-13: extends: .cross_build_job needs: - - job: s390x-debian-12-container + - job: riscv64-debian-13-container + optional: true + allow_failure: false + variables: + CROSS: riscv64 + JOB_OPTIONAL: 1 + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim + + +s390x-debian-13: + extends: .cross_build_job + needs: + - job: s390x-debian-13-container optional: true allow_failure: false variables: CROSS: s390x JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim =20 =20 aarch64-debian-sid: @@ -418,19 +405,6 @@ i686-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim =20 =20 -mips64el-debian-sid: - extends: .cross_build_job - needs: - - job: mips64el-debian-sid-container - optional: true - allow_failure: true - variables: - CROSS: mips64el - JOB_OPTIONAL: 1 - NAME: debian-sid - TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim - - ppc64le-debian-sid: extends: .cross_build_job needs: @@ -444,6 +418,19 @@ ppc64le-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim =20 =20 +riscv64-debian-sid: + extends: .cross_build_job + needs: + - job: riscv64-debian-sid-container + optional: true + allow_failure: true + variables: + CROSS: riscv64 + JOB_OPTIONAL: 1 + NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim + + s390x-debian-sid: extends: .cross_build_job needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 1383c6388e..c74443f565 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -49,11 +49,11 @@ x86_64-centos-stream-10-container: NAME: centos-stream-10 =20 =20 -x86_64-debian-12-container: +x86_64-debian-13-container: extends: .container_job allow_failure: false variables: - NAME: debian-12 + NAME: debian-13 =20 =20 x86_64-debian-sid-container: @@ -115,67 +115,59 @@ x86_64-ubuntu-2604-container: =20 # Cross container jobs =20 -aarch64-debian-12-container: +aarch64-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-aarch64 + NAME: debian-13-cross-aarch64 =20 =20 -armv6l-debian-12-container: +armv6l-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-armv6l + NAME: debian-13-cross-armv6l =20 =20 -armv7l-debian-12-container: +armv7l-debian-13-container: extends: .container_job allow_failure: false variables: - NAME: debian-12-cross-armv7l + NAME: debian-13-cross-armv7l =20 =20 -i686-debian-12-container: +i686-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-i686 + NAME: debian-13-cross-i686 =20 =20 -mips64el-debian-12-container: +ppc64le-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-mips64el + NAME: debian-13-cross-ppc64le =20 =20 -mipsel-debian-12-container: +riscv64-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-mipsel + NAME: debian-13-cross-riscv64 =20 =20 -ppc64le-debian-12-container: +s390x-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-ppc64le - - -s390x-debian-12-container: - extends: .container_job - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-12-cross-s390x + NAME: debian-13-cross-s390x =20 =20 aarch64-debian-sid-container: @@ -210,14 +202,6 @@ i686-debian-sid-container: NAME: debian-sid-cross-i686 =20 =20 -mips64el-debian-sid-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-sid-cross-mips64el - - ppc64le-debian-sid-container: extends: .container_job allow_failure: true @@ -226,6 +210,14 @@ ppc64le-debian-sid-container: NAME: debian-sid-cross-ppc64le =20 =20 +riscv64-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + JOB_OPTIONAL: 1 + NAME: debian-sid-cross-riscv64 + + s390x-debian-sid-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 94639cf0b8..2a48735a7d 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -55,7 +55,7 @@ targets: paths: - libvirt-rpms =20 - debian-12: + debian-13: jobs: - arch: x86_64 =20 @@ -76,18 +76,14 @@ targets: containers: false builds: false =20 - - arch: mips64el - containers: false - builds: false - - - arch: mipsel - containers: false - builds: false - - arch: ppc64le containers: false builds: false =20 + - arch: riscv64 + containers: false + builds: false + - arch: s390x containers: false builds: false @@ -113,11 +109,11 @@ targets: containers: false builds: false =20 - - arch: mips64el + - arch: ppc64le containers: false builds: false =20 - - arch: ppc64le + - arch: riscv64 containers: false builds: false =20 --=20 2.53.0 From nobody Thu Jun 4 19:51:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1780385005; cv=none; d=zohomail.com; s=zohoarc; b=DvBSdqlx+hgUN87oc/T1FO0e3z6qvfalPWF59VeWt3NuVvuABXrkkoa1ow2ULfCxAyrnMEqXMDFVCm0QD1jB/yuW50H2XQyCtXBgwlTNE262kdvTpE/4twsqGlT0Uyk0SWy/egAebnseK51S8IrVU/NftcWUCArdnPTeBeuW2PY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780385005; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=vd5xwlUqVCIMPI6/gXHTO+nDxCFu9NwYkQg6xe9L4OY=; b=nqnDWuCLxgz3SLKlKkzBuFn3i842n3TuNPZe6yulwRv99ByFDQkwWzbQmj7h6nnXajxne/7PVw+EfGlojgfhcrZAlGKQnwlg+V967gDsakm9NKQe/bkauRDIoO1zPP2Inzq4tso6w+e1jVth5m4YQUkmskvI2zv1JK3/UqiQC3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1780385005429746.4937371458595; Tue, 2 Jun 2026 00:23:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2090441B47; Tue, 2 Jun 2026 03:23:24 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 1C42041CDF; Tue, 2 Jun 2026 03:17:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8BE123FAF9; Tue, 2 Jun 2026 03:17:11 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E93B441907 for ; Tue, 2 Jun 2026 03:17:09 -0400 (EDT) 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-465-IQbXniZqP6aaKc6HBSdMAg-1; Tue, 02 Jun 2026 03:17:08 -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 1C82519560A6 for ; Tue, 2 Jun 2026 07:17:07 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 808911684 for ; Tue, 2 Jun 2026 07:17:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780384629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vd5xwlUqVCIMPI6/gXHTO+nDxCFu9NwYkQg6xe9L4OY=; b=A+AWlN8LuSZqPW6NaT1yl5qvBEvfwnQ/iQNG4W0MykrSvvLMEmwHzSigrKr/82pYqCCXtv kcS6za3E+sirqIRPbenQSl8lZdrcnNHoqyyEi/xQFuTKQ7kVOk4kYN5xs2uqfFCCj9ZG0U +HnyMxPb3lJaqiwcPrl5L8ZTEe796/s= X-MC-Unique: IQbXniZqP6aaKc6HBSdMAg-1 X-Mimecast-MFC-AGG-ID: IQbXniZqP6aaKc6HBSdMAg_1780384627 To: devel@lists.libvirt.org Subject: [PATCH 2/2] ci: Drop cirrus Date: Tue, 2 Jun 2026 09:16:58 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gw32dLD7ILf9uPhmRUNTCvq9DaYuVuk0D0_tql7n9Z0_1780384627 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W6CNZTASHO2EDGHG35RXXKNZU42LPQQX X-Message-ID-Hash: W6CNZTASHO2EDGHG35RXXKNZU42LPQQX X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1780385006408158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Cirrus CI shut down yesterday (2026-06-01) [1]. Stop running our CI jobs there. 1: https://cirruslabs.org/ Signed-off-by: Michal Privoznik --- ci/README.rst | 58 ----------------------------------- ci/cirrus/build.yml | 30 ------------------ ci/cirrus/freebsd-14.vars | 16 ---------- ci/cirrus/freebsd-15.vars | 16 ---------- ci/cirrus/macos-14.vars | 16 ---------- ci/gitlab/build-templates.yml | 53 -------------------------------- ci/gitlab/builds.yml | 49 ----------------------------- ci/manifest.yml | 14 ++------- 8 files changed, 3 insertions(+), 249 deletions(-) delete mode 100644 ci/cirrus/build.yml delete mode 100644 ci/cirrus/freebsd-14.vars delete mode 100644 ci/cirrus/freebsd-15.vars delete mode 100644 ci/cirrus/macos-14.vars diff --git a/ci/README.rst b/ci/README.rst index 85bfb09a8f..db1333b480 100644 --- a/ci/README.rst +++ b/ci/README.rst @@ -13,64 +13,6 @@ The behaviour of GitLab CI can be tuned through a number= of variables which can be set at push time, or through the UI. See ``ci/gitlab.yml`` for further details. =20 -Cirrus CI integration -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -libvirt currently supports three non-Linux operating systems: Windows, Fre= eBSD -and macOS. Windows cross-builds can be prepared on Linux by using `MinGW-w= 64`_, -but for both FreeBSD and macOS we need to use the actual operating system,= and -unfortunately GitLab shared runners are currently not available for either. - -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 the workaround is almost entirely -transparent to users and there's no need to constantly check two separate = CI -dashboards. - -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/libvirt``. - 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/libvirt`` - -* 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/libvirt``; - - * ``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/ -.. _MinGW-w64: https://www.mingw-w64.org/ -.. _cirrus-run: https://github.com/sio/cirrus-run/ - =20 Coverity scan integration =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml deleted file mode 100644 index c0ac05f4d9..0000000000 --- a/ci/cirrus/build.yml +++ /dev/null @@ -1,30 +0,0 @@ -@CIRRUS_VM_INSTANCE_TYPE@: - @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ - -env: - CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" - CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@" - CI_MERGE_REQUEST_REF_PATH: "@CI_MERGE_REQUEST_REF_PATH@" - CI_COMMIT_SHA: "@CI_COMMIT_SHA@" - PATH: "@PATH_EXTRA@:$PATH" - PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" - PYTHON: "@PYTHON@" - MAKE: "@MAKE@" - VIR_TEST_VERBOSE: "1" - VIR_TEST_DEBUG: "1" - -build_task: - install_script: - - @UPDATE_COMMAND@ - - @UPGRADE_COMMAND@ - - @INSTALL_COMMAND@ @PKGS@ - - if test -n "@PYPI_PKGS@" ; then @PIP3@ install --break-system-packag= es @PYPI_PKGS@ ; fi - clone_script: - - git clone --depth 100 "$CI_REPOSITORY_URL" . - - git fetch origin "${CI_MERGE_REQUEST_REF_PATH:-$CI_COMMIT_REF_NAME}" - - git reset --hard "$CI_COMMIT_SHA" - build_script: - - if test "$(uname)" =3D "Darwin"; then meson setup build --optimizati= on 0; else meson setup build; fi - - meson dist -C build --no-tests - - meson compile -C build - - meson test -C build --no-suite syntax-check --print-errorlogs || (ca= t ~/Library/Logs/DiagnosticReports/*.crash && exit 1) diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars deleted file mode 100644 index b99c663efe..0000000000 --- a/ci/cirrus/freebsd-14.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# 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'augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyr= us-sasl diffutils fusefs-libs3 gettext git glib gmake gnugrep gnutls gsed j= son-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5= pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu = readline' -PYPI_PKGS=3D'' -PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-15.vars b/ci/cirrus/freebsd-15.vars deleted file mode 100644 index b99c663efe..0000000000 --- a/ci/cirrus/freebsd-15.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# 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'augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyr= us-sasl diffutils fusefs-libs3 gettext git glib gmake gnugrep gnutls gsed j= son-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5= pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu = readline' -PYPI_PKGS=3D'' -PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars deleted file mode 100644 index 823de9e6a0..0000000000 --- a/ci/cirrus/macos-14.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE=3D'/opt/homebrew/bin/ccache' -CPAN_PKGS=3D'' -CROSS_PKGS=3D'' -MAKE=3D'/opt/homebrew/bin/gmake' -NINJA=3D'/opt/homebrew/bin/ninja' -PACKAGING_COMMAND=3D'brew' -PIP3=3D'/opt/homebrew/bin/pip3' -PKGS=3D'augeas bash-completion black ccache codespell cppi curl diffutils = docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpca= p libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python-se= tuptools python3 qemu readline' -PYPI_PKGS=3D'pytest' -PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index fc5ddc7eb9..cbee6b68f3 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -293,56 +293,3 @@ =20 # upstream+forks: that's all folks - when: never - - -.cirrus_build_job: - stage: builds - image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest - interruptible: true - needs: [] - script: - - set -o allexport - - source ci/cirrus/$NAME.vars - - set +o allexport - - cirrus-vars ci/cirrus/$NAME.yml - - cat ci/cirrus/$NAME.yml - - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml - rules: - # upstream+forks: Can't run unless Cirrus is configured - - if: '$CIRRUS_GITHUB_REPO =3D=3D null || $CIRRUS_API_TOKEN =3D=3D nul= l' - when: never - - # upstream: pushes to branches - - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push" && $JOB_OPTIONAL' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push"' - when: on_success - - # forks: pushes to branches with pipeline requested (including pipelin= e in upstream environment) - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "0"' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1" && $JOB_OPTIONAL' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1"' - when: on_success - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "0"' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1" && $JOB_O= PTIONAL' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1"' - when: on_success - - # upstream+forks: Run pipelines on MR, web, api & scheduled - - if: '$CI_PIPELINE_SOURCE =3D~ /(web|api|schedule|merge_request_event= )/ && $JOB_OPTIONAL' - when: manual - allow_failure: true - - if: '$CI_PIPELINE_SOURCE =3D~ /(web|api|schedule|merge_request_event= )/' - when: on_success - - # upstream+forks: that's all folks - - when: never diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 69c1047243..d947170ebe 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -492,52 +492,3 @@ mingw64-fedora-rawhide: JOB_OPTIONAL: 1 NAME: fedora-rawhide TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide - - -# Native cirrus build jobs - -x86_64-freebsd-14: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-3 - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - INSTALL_COMMAND: pkg install -y - NAME: freebsd-14 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - - -x86_64-freebsd-15: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: freebsd-15-0-amd64-ufs - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - INSTALL_COMMAND: pkg install -y - NAME: freebsd-15 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - - -aarch64-macos-14: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-14 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade diff --git a/ci/manifest.yml b/ci/manifest.yml index 2a48735a7d..31de78660d 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -5,6 +5,9 @@ gitlab: namespace: libvirt project: libvirt =20 +cirrus: + enabled: false + targets: almalinux-9: jobs: @@ -161,10 +164,6 @@ targets: allow-failure: true builds: false =20 - freebsd-14: x86_64 - - freebsd-15: x86_64 - opensuse-leap-15: jobs: - arch: x86_64 @@ -180,13 +179,6 @@ targets: variables: RPM: skip =20 - macos-14: - jobs: - - arch: aarch64 - variables: - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext= /bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - ubuntu-2404: jobs: - arch: x86_64 --=20 2.53.0