From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264207; cv=none; d=zohomail.com; s=zohoarc; b=g9tsZGZapMolC1CZFX7cdHDPuGfnlJQqCHIJVgp9Nl7Cj6EAoZ76GPfgFVR9HpiW+hTF7DBcvp3ZLn4fIKv8YLN1kovSCubUkH+6yiTYLiERRkemR2o5qUJLIzRSo/dUvIblk6RpCM3T5VihXwEBU6bTPJMY6EeVXejmrybqWw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264207; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bEMa9oYdGGu/RAip6piclZBl3kXaJo1fyT8fUnfY/pY=; b=btjkvsjmJyurlmS4YR+IqrZJNzbL6gY0K4Ou9BaJ+QYmM3xzyZLrQt2DMhlYrscGy6RQm9+60+rO4KO7wJjoDnA+Tug4gS/RZcXdskkBjjotXv2OBqms4bfkQG3i+lvL5eH70dglleX6gT2Sr8HVT/dRvYYfHgcqjIkJZCouY2g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631264207125605.8973743276725; Fri, 10 Sep 2021 01:56:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-317-WSsJ5EIVOROsLapzJOG2Mw-1; Fri, 10 Sep 2021 04:56:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8668718D6A2A; Fri, 10 Sep 2021 08:56:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FAA460C04; Fri, 10 Sep 2021 08:56:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0989B4E58F; Fri, 10 Sep 2021 08:56:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8uXRT026254 for ; Fri, 10 Sep 2021 04:56:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1354319733; Fri, 10 Sep 2021 08:56:33 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E85019C79; Fri, 10 Sep 2021 08:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264206; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bEMa9oYdGGu/RAip6piclZBl3kXaJo1fyT8fUnfY/pY=; b=fQl086Ws0vzdtfjS5nE0BnfWbQTj8Mc4oJEXisYysqmTziYTt5O1HnLAHFiFxzX/Wjmh8q FWejqRHrxKzHg94cICpass6QcA8VAx0HrldLAganUYGgvfnauyb+zatR9jqNGMAFVslYbC 9wB4OeIhVUA8549tbtqkpKS8lDzdkkc= X-MC-Unique: WSsJ5EIVOROsLapzJOG2Mw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/7] gitlab: move codestyle job to the sanity_checks stage Date: Fri, 10 Sep 2021 09:56:20 +0100 Message-Id: <20210910085626.943674-2-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264208572100001 It was in the build stage previously to let it run in parallel with other build jobs, but with the "needs" clause this is not required. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1609c260d..24feb48c99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -585,7 +585,7 @@ website: =20 =20 codestyle: - stage: builds + stage: sanity_checks image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest needs: - x64-opensuse-leap-152-container --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264223; cv=none; d=zohomail.com; s=zohoarc; b=kuCnTHCzBhVIEcQyyYrMbcgoNer9VDi1EJPtCFBu5hJlAAT2StC3qoV3UWWYzIrE2BEl5MdnXAvrWSbZwuZB1E4Fx/dIgF3jERUpopVMyNdPFT4fEXDgDi3I/BTLr/HsJAhWvqBfoGIKdxKH8HxfHZlqD8xF5olmUDSd++8rMAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264223; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iKX8jk+GRb1AaZaWZ7coU25kx/M8uYbNFnxwVMqxcig=; b=B9NqK4Zu6TdgJdp/Ospsbrp0xdfb54zzc448CyhB6fdD+rKYCiG0H115HXypspiah9dl6Bt6eJM0hwXCWb0w1JDplvyQPLaH3aYmhbkahtCh1Pb+BNWIjnuNdy92vVUIKUjFY1+47hQiLDMq7oRf5GYohlMm3H8i+t04b6k1Oss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631264223500769.6836801327846; Fri, 10 Sep 2021 01:57:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-_LBIVSCsNAmvfCUb827Mpg-1; Fri, 10 Sep 2021 04:57:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E7401084683; Fri, 10 Sep 2021 08:56:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0916577F30; Fri, 10 Sep 2021 08:56:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A9F624EA30; Fri, 10 Sep 2021 08:56:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8uYY4026269 for ; Fri, 10 Sep 2021 04:56:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 646B51972E; Fri, 10 Sep 2021 08:56:34 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FDB019C79; Fri, 10 Sep 2021 08:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264222; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iKX8jk+GRb1AaZaWZ7coU25kx/M8uYbNFnxwVMqxcig=; b=YmuE8iCPuJNeKqnVqvRBHjOBgZezguh6rHraVCK6p0Zjp0OMGZWtcQvCXAAtHK5e5jbXMT d9KzTAhW7RdoEwgU6eQPZznfTbUo8N2o7TwBmBIQKdMbteBM9GLOScXrFViMSqjhAtXLtK 7n1aEAw8v7GbxJLvrPL9OFhVdOQEad4= X-MC-Unique: _LBIVSCsNAmvfCUb827Mpg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/7] gitlab: refresh containers / cirrus files with latest content Date: Fri, 10 Sep 2021 09:56:21 +0100 Message-Id: <20210910085626.943674-3-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264225464100001 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- ci/cirrus/freebsd-12.vars | 6 +++--- ci/cirrus/freebsd-13.vars | 6 +++--- ci/cirrus/freebsd-current.vars | 6 +++--- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-8.Dockerfile | 3 +-- ci/containers/centos-stream-8.Dockerfile | 3 +-- ci/containers/debian-10-cross-aarch64.Dockerfile | 6 ++---- ci/containers/debian-10-cross-armv6l.Dockerfile | 6 ++---- ci/containers/debian-10-cross-armv7l.Dockerfile | 6 ++---- ci/containers/debian-10-cross-i686.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mips.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mips64el.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mipsel.Dockerfile | 6 ++---- ci/containers/debian-10-cross-ppc64le.Dockerfile | 6 ++---- ci/containers/debian-10-cross-s390x.Dockerfile | 6 ++---- ci/containers/debian-10.Dockerfile | 6 ++---- ci/containers/debian-sid-cross-aarch64.Dockerfile | 3 +-- ci/containers/debian-sid-cross-armv6l.Dockerfile | 3 +-- ci/containers/debian-sid-cross-armv7l.Dockerfile | 3 +-- ci/containers/debian-sid-cross-i686.Dockerfile | 3 +-- ci/containers/debian-sid-cross-mips64el.Dockerfile | 3 +-- ci/containers/debian-sid-cross-mipsel.Dockerfile | 3 +-- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 3 +-- ci/containers/debian-sid-cross-s390x.Dockerfile | 3 +-- ci/containers/debian-sid.Dockerfile | 3 +-- ci/containers/fedora-33.Dockerfile | 3 +-- ci/containers/fedora-34.Dockerfile | 3 +-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 3 +-- ci/containers/opensuse-leap-152.Dockerfile | 3 +-- ci/containers/opensuse-tumbleweed.Dockerfile | 3 +-- ci/containers/ubuntu-1804.Dockerfile | 3 +-- ci/containers/ubuntu-2004.Dockerfile | 3 +-- 34 files changed, 50 insertions(+), 88 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 914ad417b9..36bcc522dc 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-12 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948= 0347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci =20 PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP3=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnug= rep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson n= inja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd read= line yajl' +PIP3=3D'/usr/local/bin/pip-3.8' +PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 58c18a2f36..8a86f55237 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-13 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948= 0347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci =20 PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP3=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnug= rep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson n= inja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd read= line yajl' +PIP3=3D'/usr/local/bin/pip-3.8' +PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 1a5ac52cf9..d308986384 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-current libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948= 0347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci =20 PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP3=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnug= rep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson n= inja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd read= line yajl' +PIP3=3D'/usr/local/bin/pip-3.8' +PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 73402bab8f..1da29e9ed6 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b3072948= 0347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci =20 PACKAGING_COMMAND=3D'brew' CCACHE=3D'/usr/local/bin/ccache' diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Doc= kerfile index 9358e69b0c..2667e5f4f8 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/centos:8 =20 @@ -14,7 +14,6 @@ RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/cento= s-stream-8.Dockerfile index 3355374e67..f89f7648fe 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM quay.io/centos/centos:stream8 =20 @@ -14,7 +14,6 @@ RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index 7d10b93d06..b81a3f123e 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:arm64 \ libattr1-dev:arm64 \ libaudit-dev:arm64 \ - libavahi-client-dev:arm64 \ libblkid-dev:arm64 \ libc6-dev:arm64 \ libcap-ng-dev:arm64 \ diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index 25057ea993..dcfb73d83a 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:armel \ libattr1-dev:armel \ libaudit-dev:armel \ - libavahi-client-dev:armel \ libblkid-dev:armel \ libc6-dev:armel \ libcap-ng-dev:armel \ diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index ef880ac0fe..f125fc1789 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:armhf \ libattr1-dev:armhf \ libaudit-dev:armhf \ - libavahi-client-dev:armhf \ libblkid-dev:armhf \ libc6-dev:armhf \ libcap-ng-dev:armhf \ diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index 5826866c2d..fe9f9e3a6d 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:i386 \ libattr1-dev:i386 \ libaudit-dev:i386 \ - libavahi-client-dev:i386 \ libblkid-dev:i386 \ libc6-dev:i386 \ libcap-ng-dev:i386 \ diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index aaa2df47a8..c1b441de40 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:mips \ libattr1-dev:mips \ libaudit-dev:mips \ - libavahi-client-dev:mips \ libblkid-dev:mips \ libc6-dev:mips \ libcap-ng-dev:mips \ diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index d3f25791a3..bdce689148 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:mips64el \ libattr1-dev:mips64el \ libaudit-dev:mips64el \ - libavahi-client-dev:mips64el \ libblkid-dev:mips64el \ libc6-dev:mips64el \ libcap-ng-dev:mips64el \ diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index cc9142aa72..0bfa1e0552 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:mipsel \ libattr1-dev:mipsel \ libaudit-dev:mipsel \ - libavahi-client-dev:mipsel \ libblkid-dev:mipsel \ libc6-dev:mipsel \ libcap-ng-dev:mipsel \ diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index ce68bbb19f..08cc080f8a 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:ppc64el \ libattr1-dev:ppc64el \ libaudit-dev:ppc64el \ - libavahi-client-dev:ppc64el \ libblkid-dev:ppc64el \ libc6-dev:ppc64el \ libcap-ng-dev:ppc64el \ diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index 773f04933f..62f0584129 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:s390x \ libattr1-dev:s390x \ libaudit-dev:s390x \ - libavahi-client-dev:s390x \ libblkid-dev:s390x \ libc6-dev:s390x \ libcap-ng-dev:s390x \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.D= ockerfile index 119a77bb09..211442c673 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:10-slim =20 @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ @@ -90,8 +89,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/contain= ers/debian-sid-cross-aarch64.Dockerfile index 736414b179..3dcba9038a 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:arm64 \ libattr1-dev:arm64 \ libaudit-dev:arm64 \ - libavahi-client-dev:arm64 \ libblkid-dev:arm64 \ libc6-dev:arm64 \ libcap-ng-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index b4304a7f32..34255cd3b0 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:armel \ libattr1-dev:armel \ libaudit-dev:armel \ - libavahi-client-dev:armel \ libblkid-dev:armel \ libc6-dev:armel \ libcap-ng-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index e4db402bc9..8ec54bdee1 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:armhf \ libattr1-dev:armhf \ libaudit-dev:armhf \ - libavahi-client-dev:armhf \ libblkid-dev:armhf \ libc6-dev:armhf \ libcap-ng-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index 983cd2a336..555e36d014 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:i386 \ libattr1-dev:i386 \ libaudit-dev:i386 \ - libavahi-client-dev:i386 \ libblkid-dev:i386 \ libc6-dev:i386 \ libcap-ng-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index e568b46d60..20478e1f02 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:mips64el \ libattr1-dev:mips64el \ libaudit-dev:mips64el \ - libavahi-client-dev:mips64el \ libblkid-dev:mips64el \ libc6-dev:mips64el \ libcap-ng-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index cf24c09244..abf0642bd6 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:mipsel \ libattr1-dev:mipsel \ libaudit-dev:mipsel \ - libavahi-client-dev:mipsel \ libblkid-dev:mipsel \ libc6-dev:mipsel \ libcap-ng-dev:mipsel \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index 40be4130af..a339905329 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:ppc64el \ libattr1-dev:ppc64el \ libaudit-dev:ppc64el \ - libavahi-client-dev:ppc64el \ libblkid-dev:ppc64el \ libc6-dev:ppc64el \ libcap-ng-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index e0b7dff94a..c29bb57d88 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev:s390x \ libattr1-dev:s390x \ libaudit-dev:s390x \ - libavahi-client-dev:s390x \ libblkid-dev:s390x \ libc6-dev:s390x \ libcap-ng-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid= .Dockerfile index 454d726465..cb6a24cb50 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/debian:sid-slim =20 @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.D= ockerfile index aed94d1256..7350de493f 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.fedoraproject.org/fedora:33 =20 @@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.D= ockerfile index 53a5d67b3f..10a19a8f51 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-34 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.fedoraproject.org/fedora:34 =20 @@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index 93a57b3277..48c4dd3642 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.fedoraproject.org/fedora:rawhide =20 diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index ed16d75479..38fb9a6aeb 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.fedoraproject.org/fedora:rawhide =20 diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index 79bacbcc95..b36fb9343e 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.fedoraproject.org/fedora:rawhide =20 @@ -21,7 +21,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/ope= nsuse-leap-152.Dockerfile index b5f7e5f54e..abe3e57185 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-leap-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.opensuse.org/opensuse/leap:15.2 =20 @@ -11,7 +11,6 @@ RUN zypper update -y && \ audit-devel \ augeas \ augeas-lenses \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/o= pensuse-tumbleweed.Dockerfile index 9f49fdabfd..18b136fe03 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-tumbleweed libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM registry.opensuse.org/opensuse/tumbleweed:latest =20 @@ -11,7 +11,6 @@ RUN zypper update -y && \ audit-devel \ augeas \ augeas-lenses \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-18= 04.Dockerfile index 5e4a2e0b8f..21b73e62aa 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/ubuntu:18.04 =20 @@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-20= 04.Dockerfile index 0e2790f03f..5654ad003f 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244= a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci =20 FROM docker.io/library/ubuntu:20.04 =20 @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264346; cv=none; d=zohomail.com; s=zohoarc; b=IXCCSCmF3jNSf3wOAjtLcV9JiPNrIPccoj9RGGZt+kjueYf3rWnIRpwGQenTKtTNGa14LlQkoAncmJdIO61eh7DQSn1HMKjXVKyXOPVx9ve9nZotWpnAL77he3V+1NZIxSA4fmYya+J9xa5qKz9/3E/HLEXD4Dfa2XmiN6mj+dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264346; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vi+0fHwPao+7Ve+/EJM/JVkcYkAMv3jGiDBIlIdm9PE=; b=ZODmYIbeh3GI86KVw+H3PMUQBsU6aj1ZCRe++LvqycgDArM5oF1YbinZfRRcFnsGJwt/CRsny9tKJp0IPwdzLImO15jB89rsdJ8Gor91YY1OBgpW5HsIOQVrC2CZqTWUEosZlEeaJ/SOk7zghYISrq39sjX5qo8IaTLONyzgkO4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631264346437234.84216209505382; Fri, 10 Sep 2021 01:59:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-1GKkEiAqNaSg_pi82vzTfg-1; Fri, 10 Sep 2021 04:57:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63B531084687; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4412618432; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 129C34EA38; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8uZFo026277 for ; Fri, 10 Sep 2021 04:56:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B9A219733; Fri, 10 Sep 2021 08:56:35 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id B72C319C79; Fri, 10 Sep 2021 08:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264345; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Vi+0fHwPao+7Ve+/EJM/JVkcYkAMv3jGiDBIlIdm9PE=; b=PZ4ANfcETn3olhlBAFMvVwp1ZHh8dIrZBoAW0hUzhuKRP4W6hMy1Fuom+JdSu8f2nZtTqH Gwd2hHRBuP5RyXvZMmS+thmVSNeiu8jZEVNsXCivqnylIOvjZEZaoiWFaJxL/USu2EqZaL yntpJ6Kk67j6cj1V8QVJoJgqEx90GvU= X-MC-Unique: 1GKkEiAqNaSg_pi82vzTfg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] gitlab: fold sanitizer jobs into regular ubuntu jobs Date: Fri, 10 Sep 2021 09:56:22 +0100 Message-Id: <20210910085626.943674-4-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264348493100001 The sanitizer jobs run in ubuntu 20.04 containers and thus overlap with testing already done for the regular ubuntu 20.04 build job. Fold the sanitizer run for GCC into the regular build job and add a second ubuntu 20.04 build job for CLang sanitizers. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- .gitlab-ci.yml | 53 ++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24feb48c99..567ff91c82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ stages: before_script: - *script_variables script: - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) + - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meso= n-log.txt && exit 1) - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then @@ -71,27 +71,6 @@ stages: meson test -C build --no-suite syntax-check --print-errorlogs; fi =20 -.sanitizer_build_job: - stage: builds - image: $CI_REGISTRY_IMAGE/ci-ubuntu-2004:latest - needs: - - x64-ubuntu-2004-container - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - when: on_success - cache: - paths: - - ccache/ - key: "$CI_JOB_NAME" - before_script: - - *script_variables - script: - - meson build --werror -Ddocs=3Ddisabled -Db_lundef=3Dfalse -Db_saniti= ze=3D"$SANITIZER" - - ninja -C build; - - ninja -C build test; - variables: - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 =20 # Jobs that we delegate to Cirrus CI because they require an operating # system other than Linux. These jobs will only run if the required @@ -418,6 +397,20 @@ x64-ubuntu-2004: - x64-ubuntu-2004-container variables: NAME: ubuntu-2004 + ASAN_OPTIONS: verify_asan_link_order=3D0 + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + +x64-ubuntu-2004-clang: + extends: .native_build_job + needs: + - x64-ubuntu-2004-container + variables: + NAME: ubuntu-2004 + CC: clang + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + =20 x64-freebsd-12-build: extends: .cirrus_build_job @@ -545,22 +538,6 @@ mingw64-fedora-rawhide: NAME: fedora-rawhide CROSS: mingw64 =20 -# Sanitizers - -sanitize-gcc: - extends: .sanitizer_build_job - variables: - ASAN_OPTIONS: verify_asan_link_order=3D0 - CC: gcc - SANITIZER: address,undefined - -sanitize-clang: - extends: .sanitizer_build_job - variables: - CC: clang - SANITIZER: address,undefined - - # This artifact published by this job is downloaded by libvirt.org to # be deployed to the web root: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264349; cv=none; d=zohomail.com; s=zohoarc; b=dN9x8aTooJiz92+WSF9qMy987Q0TGCO3M6g12+qhvBTfCR3gZGm/qMP4LmrXz1qxudL7RolpsVHZR7QJrdMvGKNVtwrhe/rfnx7LrwsczQDeiPr49QfYg2BIUy/m+G95FebLWINEfg29FjvzhxHqa9Ku4et3NmPJTEv2t/qf4/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264349; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rH/bJUIlcuSIQjaiwi9f1Id9Eq8/7k3vEjBkbnpJkbo=; b=RmDC8y0UsMEOpNUERLI4A+z+mEsu2L+gjtiSIUJ7sO9R36sOEPdoW+zEy6fBM7mgV7zFWPsztrpCxUgHrvhNCDM3AjYgj004yIEjGdSiYmHwDjpACTuWIDp7mPulANfIXGbKQ0wbrD8/NjRgWlccFQAiNNjfivHg/+n1bHpn9T4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1631264349310364.3468055454201; Fri, 10 Sep 2021 01:59:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345--9bBHuVjPeyvbBN_yudISQ-1; Fri, 10 Sep 2021 04:57:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4DB81006AA3; Fri, 10 Sep 2021 08:56:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB3D177F30; Fri, 10 Sep 2021 08:56:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8E69B1803B30; Fri, 10 Sep 2021 08:56:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8uaVH026293 for ; Fri, 10 Sep 2021 04:56:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 547A719733; Fri, 10 Sep 2021 08:56:36 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADD7319C79; Fri, 10 Sep 2021 08:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264348; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rH/bJUIlcuSIQjaiwi9f1Id9Eq8/7k3vEjBkbnpJkbo=; b=Tb3105Zvy7SGCGv2eWeo1OqaMCB0E2f/MvWjCA/UbuFD1ZcdC87o7NrQdH6yaDoVTqT8zC OgJw9z5FosRjXcE1/a5QDa4ZsLgksoYcC6UNJQMsy0qWbTFS5FJ4B/rCcia22Sciik1xIM gGEmFvm5167wY9JpfLxFC38ecmV/cBk= X-MC-Unique: -9bBHuVjPeyvbBN_yudISQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] gitlab: define a manifest file to express the CI config Date: Fri, 10 Sep 2021 09:56:23 +0100 Message-Id: <20210910085626.943674-5-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264350574100001 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- ci/manifest.yml | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 ci/manifest.yml diff --git a/ci/manifest.yml b/ci/manifest.yml new file mode 100644 index 0000000000..b25ab2dfcf --- /dev/null +++ b/ci/manifest.yml @@ -0,0 +1,153 @@ +projects: + - libvirt + +gitlab: + namespace: libvirt + project: libvirt + +targets: + centos-8: + jobs: + - arch: x86_64 + variables: + RPM: skip + + - arch: x86_64 + suffix: -clang + variables: + RPM: skip + CC: clang + + centos-stream-8: + jobs: + - arch: x86_64 + variables: + RPM: skip + + debian-10: + jobs: + - arch: x86_64 + + - arch: x86_64 + suffix: -clang + + - arch: aarch64 + allow-failure: true + builds: false + + - arch: armv6l + + - arch: armv7l + + - arch: i686 + allow-failure: true + builds: false + + - arch: mips + + - arch: mips64el + allow-failure: true + builds: false + + - arch: mipsel + + - arch: ppc64le + + - arch: s390x + allow-failure: true + builds: false + + debian-sid: + jobs: + - arch: x86_64 + + - arch: aarch64 + + - arch: armv6l + allow-failure: true + builds: false + + - arch: armv7l + allow-failure: true + builds: false + + - arch: i686 + + - arch: mips64el + + - arch: mipsel + allow-failure: true + builds: false + + - arch: ppc64le + allow-failure: true + builds: false + + - arch: s390x + + fedora-33: x86_64 + + fedora-34: x86_64 + + fedora-rawhide: + jobs: + - arch: x86_64 + allow-failure: true + + - arch: x86_64 + suffix: -clang + allow-failure: true + variables: + CC: clang + RPM: skip + + - arch: mingw32 + allow-failure: true + + - arch: mingw64 + allow-failure: true + + freebsd-12: x86_64 + + freebsd-13: x86_64 + + freebsd-current: + jobs: + - arch: x86_64 + builds: False + + opensuse-leap-152: + jobs: + - arch: x86_64 + variables: + RPM: skip + + opensuse-tumbleweed: + jobs: + - arch: x86_64 + variables: + RPM: skip + + macos-11: + jobs: + - arch: x86_64 + variables: + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext= /bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/r= pcgen/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-1804: x86_64 + + ubuntu-2004: + jobs: + - arch: x86_64 + variables: + ASAN_OPTIONS: verify_asan_link_order=3D0 + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + + - arch: x86_64 + suffix: -clang + variables: + CC: clang + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264229; cv=none; d=zohomail.com; s=zohoarc; b=jRwieOg3rN/bKiAGVX3oeuee55KtC/k3TVT4YWDum0+haVzzR/8FlZADpyq8O0oX7Q+QkcN9dmyAJpj4+tTJ58mX21hs9z0y7cFStBXe+UPtzruRaWgGeHPA2iCmnYUZ1BQC/KATmhrGz/9fOUk+ftJot5e9TJ0iF1VQVQNFmXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264229; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hiet+agFru5vYLSTmx4/8oIqbihhfx740M2BwmE4sRU=; b=YeJ+MLE5ajI846kA6792lr3QtY4eTIir4Fvy7WPpLe1dWWJNMogydfHDxpvGtX3rnL4PFLG98ZIpeOv4RXv4qIgiDCkVNnMpZiZWu0ZqpHcI0ILwnaeeTADkdxxavJlIqAhWlWIF1x90S7eDZVQkSm39wycqLFow0ZhmYbIG4YI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1631264229775129.82739363395615; Fri, 10 Sep 2021 01:57:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-452-BUIqiMf8MnmS7QoTxYpjbA-1; Fri, 10 Sep 2021 04:57:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38F5980124F; Fri, 10 Sep 2021 08:57:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13EE060C04; Fri, 10 Sep 2021 08:57:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CFE454EA40; Fri, 10 Sep 2021 08:57:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8ub06026305 for ; Fri, 10 Sep 2021 04:56:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 765B319733; Fri, 10 Sep 2021 08:56:37 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5D8E19C79; Fri, 10 Sep 2021 08:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264228; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hiet+agFru5vYLSTmx4/8oIqbihhfx740M2BwmE4sRU=; b=AN22Yx2JZYaEE8itvQ3ugwLfePz0DdZHzCX94hw5/BO1CVq/tqnpRyKhdupCraBhh1awUQ UsyWiVIlJ55Zu+UZfhjT8lBAvpMPLmp53uNalxS4V/sX3/JJ4sMNXM94rKjPm8uww9P1Gi S3hO+7rlfPWPftmcwV8M591L7jrYdCk= X-MC-Unique: BUIqiMf8MnmS7QoTxYpjbA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] ci: re-generate containers/gitlab config from manifest Date: Fri, 10 Sep 2021 09:56:24 +0100 Message-Id: <20210910085626.943674-6-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264232022100002 This uses the command "lcitool manifest ci/manifest.yml" to re-generate all existing dockerfiles and gitlab CI config. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- .gitlab-ci.yml | 512 +-------------- ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-8.Dockerfile | 2 +- ci/containers/centos-stream-8.Dockerfile | 2 +- .../debian-10-cross-aarch64.Dockerfile | 2 +- .../debian-10-cross-armv6l.Dockerfile | 2 +- .../debian-10-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-10-cross-i686.Dockerfile | 2 +- ci/containers/debian-10-cross-mips.Dockerfile | 2 +- .../debian-10-cross-mips64el.Dockerfile | 2 +- .../debian-10-cross-mipsel.Dockerfile | 2 +- .../debian-10-cross-ppc64le.Dockerfile | 2 +- .../debian-10-cross-s390x.Dockerfile | 2 +- ci/containers/debian-10.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- .../debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-mipsel.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-33.Dockerfile | 2 +- ci/containers/fedora-34.Dockerfile | 2 +- .../fedora-rawhide-cross-mingw32.Dockerfile | 2 +- .../fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-leap-152.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- ci/containers/ubuntu-1804.Dockerfile | 2 +- ci/containers/ubuntu-2004.Dockerfile | 2 +- ci/gitlab.yml | 602 ++++++++++++++++++ 36 files changed, 643 insertions(+), 539 deletions(-) create mode 100644 ci/gitlab.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 567ff91c82..b396a1511d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,42 +14,10 @@ stages: export VIR_TEST_VERBOSE=3D"1" export VIR_TEST_DEBUG=3D"1" =20 -# Common templates - -.container_job: - image: docker:stable - stage: containers - needs: [] - services: - - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master - alias: docker - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - when: on_success - before_script: - - export TAG=3D"$CI_REGISTRY_IMAGE/ci-$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest" - - docker info - - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" - script: - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers - - docker push "$TAG" - after_script: - - docker logout - -# We build many containers which can be useful to debug problems but are n= ot -# needed for the pipeline itself to complete: those sometimes fail, and wh= en -# that happens it's mostly because of temporary issues with Debian sid. We -# don't want those failures to affect the overall pipeline status -.container_optional_job: - extends: .container_job - allow_failure: true +include: '/ci/gitlab.yml' =20 .native_build_job: - stage: builds - image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + extends: .gitlab_native_build_job rules: - if: "$TEMPORARILY_DISABLED" allow_failure: true @@ -71,52 +39,8 @@ stages: meson test -C build --no-suite syntax-check --print-errorlogs; fi =20 - -# Jobs that we delegate to Cirrus CI because they require an operating -# system other than Linux. These jobs will only run if the required -# setup has been performed on the GitLab account (see ci/README.rst). -# -# The Cirrus CI configuration is generated by replacing target-specific -# variables in a generic template: some of these variables are provided -# when the GitLab CI job is defined, others are taken from a shell -# snippet generated using lcitool. -# -# Note that the $PATH environment variable has to be treated with -# special care, because we can't just override it at the GitLab CI job -# definition level or we risk breaking it completely. -.cirrus_build_job: - stage: builds - image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master - needs: [] - script: - - source ci/cirrus/$NAME.vars - - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" - -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" - -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" - -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" - -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" - -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" - -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" - -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g" - -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" - -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" - -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" - -e "s|[@]PKGS@|$PKGS|g" - -e "s|[@]MAKE@|$MAKE|g" - -e "s|[@]PYTHON@|$PYTHON|g" - -e "s|[@]PIP3@|$PIP3|g" - -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" - ci/cirrus/$NAME.yml - - cat ci/cirrus/$NAME.yml - - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" - .cross_build_job: - stage: builds - image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest + extends: .gitlab_cross_build_job cache: paths: - ccache/ @@ -133,411 +57,6 @@ stages: - if test "$CROSS" =3D "i686" ; then meson test -C build --no-suite sy= ntax-check --print-errorlogs ; fi =20 =20 -# Native container build jobs - -x64-centos-8-container: - extends: .container_job - variables: - NAME: centos-8 - -x64-centos-stream-8-container: - extends: .container_job - variables: - NAME: centos-stream-8 - -x64-debian-10-container: - extends: .container_job - variables: - NAME: debian-10 - -x64-debian-sid-container: - extends: .container_job - variables: - NAME: debian-sid - -x64-fedora-33-container: - extends: .container_job - variables: - NAME: fedora-33 - -x64-fedora-34-container: - extends: .container_job - variables: - NAME: fedora-34 - -x64-fedora-rawhide-container: - extends: .container_optional_job - variables: - NAME: fedora-rawhide - -x64-opensuse-leap-152-container: - extends: .container_job - variables: - NAME: opensuse-leap-152 - -x64-opensuse-tumbleweed-container: - extends: .container_job - variables: - NAME: opensuse-tumbleweed - -x64-ubuntu-1804-container: - extends: .container_job - variables: - NAME: ubuntu-1804 - -x64-ubuntu-2004-container: - extends: .container_job - variables: - NAME: ubuntu-2004 - - -# Cross-build containers build jobs - -aarch64-debian-10-container: - extends: .container_optional_job - variables: - NAME: debian-10-cross-aarch64 - -armv6l-debian-10-container: - extends: .container_job - variables: - NAME: debian-10-cross-armv6l - -armv7l-debian-10-container: - extends: .container_job - variables: - NAME: debian-10-cross-armv7l - -i686-debian-10-container: - extends: .container_optional_job - variables: - NAME: debian-10-cross-i686 - -mips-debian-10-container: - extends: .container_job - variables: - NAME: debian-10-cross-mips - -mips64el-debian-10-container: - extends: .container_optional_job - variables: - NAME: debian-10-cross-mips64el - -mipsel-debian-10-container: - extends: .container_job - variables: - NAME: debian-10-cross-mipsel - -ppc64le-debian-10-container: - extends: .container_job - variables: - NAME: debian-10-cross-ppc64le - -s390x-debian-10-container: - extends: .container_optional_job - variables: - NAME: debian-10-cross-s390x - -aarch64-debian-sid-container: - extends: .container_job - variables: - NAME: debian-sid-cross-aarch64 - -armv6l-debian-sid-container: - extends: .container_optional_job - variables: - NAME: debian-sid-cross-armv6l - -armv7l-debian-sid-container: - extends: .container_optional_job - variables: - NAME: debian-sid-cross-armv7l - -i686-debian-sid-container: - extends: .container_job - variables: - NAME: debian-sid-cross-i686 - -mips64el-debian-sid-container: - extends: .container_job - variables: - NAME: debian-sid-cross-mips64el - -mipsel-debian-sid-container: - extends: .container_optional_job - variables: - NAME: debian-sid-cross-mipsel - -ppc64le-debian-sid-container: - extends: .container_optional_job - variables: - NAME: debian-sid-cross-ppc64le - -s390x-debian-sid-container: - extends: .container_job - variables: - NAME: debian-sid-cross-s390x - -mingw32-fedora-rawhide-container: - extends: .container_optional_job - variables: - NAME: fedora-rawhide-cross-mingw32 - -mingw64-fedora-rawhide-container: - extends: .container_optional_job - variables: - NAME: fedora-rawhide-cross-mingw64 - - -# Native architecture build + test jobs - -x64-debian-10: - extends: .native_build_job - needs: - - x64-debian-10-container - variables: - NAME: debian-10 - -x64-debian-10-clang: - extends: .native_build_job - needs: - - x64-debian-10-container - variables: - NAME: debian-10 - CC: clang - -x64-debian-sid: - extends: .native_build_job - needs: - - x64-debian-sid-container - variables: - NAME: debian-sid - -x64-centos-8: - extends: .native_build_job - needs: - - x64-centos-8-container - variables: - NAME: centos-8 - RPM: skip - -x64-centos-8-clang: - extends: .native_build_job - needs: - - x64-centos-8-container - variables: - NAME: centos-8 - CC: clang - RPM: skip - -x64-centos-stream-8: - extends: .native_build_job - needs: - - x64-centos-stream-8-container - variables: - NAME: centos-stream-8 - RPM: skip - -x64-fedora-33: - extends: .native_build_job - needs: - - x64-fedora-33-container - variables: - NAME: fedora-33 - -x64-fedora-34: - extends: .native_build_job - needs: - - x64-fedora-34-container - variables: - NAME: fedora-34 - -x64-fedora-rawhide: - extends: .native_build_job - needs: - - x64-fedora-rawhide-container - variables: - NAME: fedora-rawhide - -x64-fedora-rawhide-clang: - extends: .native_build_job - needs: - - x64-fedora-rawhide-container - variables: - NAME: fedora-rawhide - CC: clang - RPM: skip - -x64-opensuse-leap-152: - extends: .native_build_job - needs: - - x64-opensuse-leap-152-container - variables: - NAME: opensuse-leap-152 - RPM: skip - -x64-opensuse-tumbleweed: - extends: .native_build_job - needs: - - x64-opensuse-tumbleweed-container - variables: - NAME: opensuse-tumbleweed - RPM: skip - -x64-ubuntu-1804: - extends: .native_build_job - needs: - - x64-ubuntu-1804-container - variables: - NAME: ubuntu-1804 - -x64-ubuntu-2004: - extends: .native_build_job - needs: - - x64-ubuntu-2004-container - variables: - NAME: ubuntu-2004 - ASAN_OPTIONS: verify_asan_link_order=3D0 - MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 - -x64-ubuntu-2004-clang: - extends: .native_build_job - needs: - - x64-ubuntu-2004-container - variables: - NAME: ubuntu-2004 - CC: clang - MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 - - -x64-freebsd-12-build: - extends: .cirrus_build_job - variables: - NAME: freebsd-12 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-12-2 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - INSTALL_COMMAND: pkg install -y - -x64-freebsd-13-build: - extends: .cirrus_build_job - variables: - NAME: freebsd-13 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-13-0 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - INSTALL_COMMAND: pkg install -y - -x64-macos-11-build: - extends: .cirrus_build_job - variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: big-sur-base - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - INSTALL_COMMAND: brew install - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - - -# Cross compiled build jobs - -aarch64-debian-sid: - extends: .cross_build_job - needs: - - aarch64-debian-sid-container - variables: - NAME: debian-sid - CROSS: aarch64 - -armv6l-debian-10: - extends: .cross_build_job - needs: - - armv6l-debian-10-container - variables: - NAME: debian-10 - CROSS: armv6l - -armv7l-debian-10: - extends: .cross_build_job - needs: - - armv7l-debian-10-container - variables: - NAME: debian-10 - CROSS: armv7l - -i686-debian-sid: - extends: .cross_build_job - needs: - - i686-debian-sid-container - variables: - NAME: debian-sid - CROSS: i686 - -mips-debian-10: - extends: .cross_build_job - needs: - - mips-debian-10-container - variables: - NAME: debian-10 - CROSS: mips - -mips64el-debian-sid: - extends: .cross_build_job - needs: - - mips64el-debian-sid-container - variables: - NAME: debian-sid - CROSS: mips64el - -mipsel-debian-10: - extends: .cross_build_job - needs: - - mipsel-debian-10-container - variables: - NAME: debian-10 - CROSS: mipsel - -ppc64le-debian-10: - extends: .cross_build_job - needs: - - ppc64le-debian-10-container - variables: - NAME: debian-10 - CROSS: ppc64le - -s390x-debian-sid: - extends: .cross_build_job - needs: - - s390x-debian-sid-container - variables: - NAME: debian-sid - CROSS: s390x - -mingw32-fedora-rawhide: - extends: .cross_build_job - needs: - - mingw32-fedora-rawhide-container - variables: - NAME: fedora-rawhide - CROSS: mingw32 - -mingw64-fedora-rawhide: - extends: .cross_build_job - needs: - - mingw64-fedora-rawhide-container - variables: - NAME: fedora-rawhide - CROSS: mingw64 - # This artifact published by this job is downloaded by libvirt.org to # be deployed to the web root: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite @@ -545,7 +64,7 @@ website: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x64-centos-8-container + - x86_64-centos-8-container before_script: - *script_variables script: @@ -565,7 +84,7 @@ codestyle: stage: sanity_checks image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest needs: - - x64-opensuse-leap-152-container + - x86_64-opensuse-leap-152-container before_script: - *script_variables script: @@ -581,7 +100,7 @@ potfile: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x64-centos-8-container + - x86_64-centos-8-container rules: - if: "$CI_COMMIT_BRANCH =3D=3D 'master'" before_script: @@ -599,28 +118,11 @@ potfile: paths: - libvirt.pot =20 - -# Check that all commits are signed-off for the DCO. -# Skip on "libvirt" namespace, since we only need to run -# this test on developer's personal forks from which -# merge requests are submitted -check-dco: - stage: sanity_checks - needs: [] - image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master - script: - - /check-dco - rules: - - if: "$CI_PROJECT_NAMESPACE !=3D 'libvirt'" - variables: - GIT_DEPTH: 1000 - - # Coverity job that is run only by schedules coverity: image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x64-centos-8-container + - x86_64-centos-8-container stage: builds script: - curl https://scan.coverity.com/download/linux64 --form project=3D$CO= VERITY_SCAN_PROJECT_NAME --form token=3D$COVERITY_SCAN_TOKEN -o /tmp/cov-an= alysis-linux64.tgz diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 36bcc522dc..4318b255e9 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables freebsd-12 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 8a86f55237..4318b255e9 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables freebsd-13 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index d308986384..4318b255e9 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables freebsd-current libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 1da29e9ed6..065d86aa45 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-11 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Doc= kerfile index 2667e5f4f8..5ac1e45459 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/cento= s-stream-8.Dockerfile index f89f7648fe..6baf576580 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-stream-8 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index b81a3f123e..3f0010d081 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross aarch64 debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index dcfb73d83a..853844d3f1 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross armv6l debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index f125fc1789..4d00116849 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross armv7l debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index fe9f9e3a6d..9c50fe0674 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross i686 debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index c1b441de40..fbeb8db795 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mips debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index bdce689148..5212a02999 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mips64el debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index 0bfa1e0552..2e9e716b21 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mipsel debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index 08cc080f8a..2f1a56a624 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross ppc64le debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index 62f0584129..d7b06ec383 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross s390x debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.D= ockerfile index 211442c673..633d9a972e 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile debian-10 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/contain= ers/debian-sid-cross-aarch64.Dockerfile index 3dcba9038a..e481c63388 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross aarch64 debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv6l.Dockerfile index 34255cd3b0..3f63b3e86f 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross armv6l debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containe= rs/debian-sid-cross-armv7l.Dockerfile index 8ec54bdee1..55f527b207 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross armv7l debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers= /debian-sid-cross-i686.Dockerfile index 555e36d014..719547ab31 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross i686 debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/contai= ners/debian-sid-cross-mips64el.Dockerfile index 20478e1f02..e1fac818a1 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mips64el debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containe= rs/debian-sid-cross-mipsel.Dockerfile index abf0642bd6..3684fe3bf9 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mipsel debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/contain= ers/debian-sid-cross-ppc64le.Dockerfile index a339905329..1d1aa18e33 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross ppc64le debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/container= s/debian-sid-cross-s390x.Dockerfile index c29bb57d88..5d2fdd6a1b 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross s390x debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid= .Dockerfile index cb6a24cb50..d8667c5f1b 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile debian-sid libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.D= ockerfile index 7350de493f..0025e66d6a 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-33 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.D= ockerfile index 10a19a8f51..9be6efc7ba 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-34 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index 48c4dd3642..6f00940347 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index 38fb9a6aeb..48c2a755d3 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index b36fb9343e..74e1f01483 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-rawhide libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/ope= nsuse-leap-152.Dockerfile index abe3e57185..23f03ed482 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/o= pensuse-tumbleweed.Dockerfile index 18b136fe03..be2d6b6d25 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-tumbleweed libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-18= 04.Dockerfile index 21b73e62aa..6dcd965e65 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-20= 04.Dockerfile index 5654ad003f..f86eb9aef5 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 libvirt +# $ lcitool manifest ci/manifest.yml # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/ci/gitlab.yml b/ci/gitlab.yml new file mode 100644 index 0000000000..6063ce8351 --- /dev/null +++ b/ci/gitlab.yml @@ -0,0 +1,602 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +.container_job: + image: docker:stable + stage: containers + needs: [] + services: + - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master + alias: docker + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers + - docker push "$TAG" + after_script: + - docker logout + + +.gitlab_native_build_job: + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + + +.gitlab_cross_build_job: + image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest + stage: builds + + +.cirrus_build_job: + stage: builds + image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master + needs: [] + script: + - source ci/cirrus/$NAME.vars + - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" + -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" + -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" + -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" + -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" + -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" + -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g" + -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" + -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" + -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" + -e "s|[@]PKGS@|$PKGS|g" + -e "s|[@]MAKE@|$MAKE|g" + -e "s|[@]PYTHON@|$PYTHON|g" + -e "s|[@]PIP3@|$PIP3|g" + -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" + ci/cirrus/$NAME.yml + - cat ci/cirrus/$NAME.yml + - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml + rules: + - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" + + +check-dco: + stage: sanity_checks + needs: [] + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + script: + - /check-dco libvirt + except: + variables: + - $CI_PROJECT_NAMESPACE =3D=3D 'libvirt' + variables: + GIT_DEPTH: 1000 + + +# Native container jobs + +x86_64-centos-8-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-8 + + +x86_64-centos-stream-8-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-stream-8 + + +x86_64-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid + + +x86_64-fedora-33-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-33 + + +x86_64-fedora-34-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-34 + + +x86_64-fedora-rawhide-container: + extends: .container_job + allow_failure: true + variables: + NAME: fedora-rawhide + + +x86_64-opensuse-leap-152-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-leap-152 + + +x86_64-opensuse-tumbleweed-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-tumbleweed + + +x86_64-ubuntu-1804-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-2004 + + + +# Cross container jobs + +aarch64-debian-10-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-10-cross-aarch64 + + +armv6l-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10-cross-armv6l + + +armv7l-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10-cross-armv7l + + +i686-debian-10-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-10-cross-i686 + + +mips-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10-cross-mips + + +mips64el-debian-10-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-10-cross-mips64el + + +mipsel-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10-cross-mipsel + + +ppc64le-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10-cross-ppc64le + + +s390x-debian-10-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-10-cross-s390x + + +aarch64-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid-cross-aarch64 + + +armv6l-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-sid-cross-armv6l + + +armv7l-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-sid-cross-armv7l + + +i686-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid-cross-i686 + + +mips64el-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid-cross-mips64el + + +mipsel-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-sid-cross-mipsel + + +ppc64le-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + NAME: debian-sid-cross-ppc64le + + +s390x-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid-cross-s390x + + +mingw32-fedora-rawhide-container: + extends: .container_job + allow_failure: true + variables: + NAME: fedora-rawhide-cross-mingw32 + + +mingw64-fedora-rawhide-container: + extends: .container_job + allow_failure: true + variables: + NAME: fedora-rawhide-cross-mingw64 + + +# Native build jobs + +x86_64-centos-8: + extends: .native_build_job + needs: + - x86_64-centos-8-container + allow_failure: false + variables: + NAME: centos-8 + RPM: skip + + +x86_64-centos-8-clang: + extends: .native_build_job + needs: + - x86_64-centos-8-container + allow_failure: false + variables: + NAME: centos-8 + RPM: skip + CC: clang + + +x86_64-centos-stream-8: + extends: .native_build_job + needs: + - x86_64-centos-stream-8-container + allow_failure: false + variables: + NAME: centos-stream-8 + RPM: skip + + +x86_64-debian-10: + extends: .native_build_job + needs: + - x86_64-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-10-clang: + extends: .native_build_job + needs: + - x86_64-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-sid: + extends: .native_build_job + needs: + - x86_64-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + + +x86_64-fedora-33: + extends: .native_build_job + needs: + - x86_64-fedora-33-container + allow_failure: false + variables: + NAME: fedora-33 + + +x86_64-fedora-34: + extends: .native_build_job + needs: + - x86_64-fedora-34-container + allow_failure: false + variables: + NAME: fedora-34 + + +x86_64-fedora-rawhide: + extends: .native_build_job + needs: + - x86_64-fedora-rawhide-container + allow_failure: true + variables: + NAME: fedora-rawhide + + +x86_64-fedora-rawhide-clang: + extends: .native_build_job + needs: + - x86_64-fedora-rawhide-container + allow_failure: true + variables: + NAME: fedora-rawhide + CC: clang + RPM: skip + + +x86_64-opensuse-leap-152: + extends: .native_build_job + needs: + - x86_64-opensuse-leap-152-container + allow_failure: false + variables: + NAME: opensuse-leap-152 + RPM: skip + + +x86_64-opensuse-tumbleweed: + extends: .native_build_job + needs: + - x86_64-opensuse-tumbleweed-container + allow_failure: false + variables: + NAME: opensuse-tumbleweed + RPM: skip + + +x86_64-ubuntu-1804: + extends: .native_build_job + needs: + - x86_64-ubuntu-1804-container + allow_failure: false + variables: + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004: + extends: .native_build_job + needs: + - x86_64-ubuntu-2004-container + allow_failure: false + variables: + NAME: ubuntu-2004 + ASAN_OPTIONS: verify_asan_link_order=3D0 + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + + +x86_64-ubuntu-2004-clang: + extends: .native_build_job + needs: + - x86_64-ubuntu-2004-container + allow_failure: false + variables: + NAME: ubuntu-2004 + CC: clang + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + + + +# Cross build jobs + +armv6l-debian-10: + extends: .cross_build_job + needs: + - armv6l-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + CROSS: armv6l + + +armv7l-debian-10: + extends: .cross_build_job + needs: + - armv7l-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + CROSS: armv7l + + +mips-debian-10: + extends: .cross_build_job + needs: + - mips-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + CROSS: mips + + +mipsel-debian-10: + extends: .cross_build_job + needs: + - mipsel-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + CROSS: mipsel + + +ppc64le-debian-10: + extends: .cross_build_job + needs: + - ppc64le-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + CROSS: ppc64le + + +aarch64-debian-sid: + extends: .cross_build_job + needs: + - aarch64-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + CROSS: aarch64 + + +i686-debian-sid: + extends: .cross_build_job + needs: + - i686-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + CROSS: i686 + + +mips64el-debian-sid: + extends: .cross_build_job + needs: + - mips64el-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + CROSS: mips64el + + +s390x-debian-sid: + extends: .cross_build_job + needs: + - s390x-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + CROSS: s390x + + +mingw32-fedora-rawhide: + extends: .cross_build_job + needs: + - mingw32-fedora-rawhide-container + allow_failure: true + variables: + NAME: fedora-rawhide + CROSS: mingw32 + + +mingw64-fedora-rawhide: + extends: .cross_build_job + needs: + - mingw64-fedora-rawhide-container + allow_failure: true + variables: + NAME: fedora-rawhide + CROSS: mingw64 + + +# Native cirrus build jobs + +x86_64-freebsd-12: + extends: .cirrus_build_job + needs: [] + allow_failure: false + variables: + NAME: freebsd-12 + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + UPDATE_COMMAND: pkg update + UPGRADE_COMMAND: pkg upgrade -y + INSTALL_COMMAND: pkg install -y + + +x86_64-freebsd-13: + extends: .cirrus_build_job + needs: [] + allow_failure: false + variables: + NAME: freebsd-13 + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + UPDATE_COMMAND: pkg update + UPGRADE_COMMAND: pkg upgrade -y + INSTALL_COMMAND: pkg install -y + + +x86_64-macos-11: + extends: .cirrus_build_job + needs: [] + allow_failure: false + variables: + NAME: macos-11 + CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: big-sur-base + UPDATE_COMMAND: brew update + UPGRADE_COMMAND: brew upgrade + INSTALL_COMMAND: brew install + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264226; cv=none; d=zohomail.com; s=zohoarc; b=SPe/SzbW2/JgzhvtMYimRLrhf7BT835Po8XxKw4U5rpnqlUbnZGbKmsCaX7M49P2OPbRMPOUW3SSLn8xcXpZZmhIPa0SfFU7oMvl6DFRo0gYsvRTf5Yy5iwDF1+9WkrS/jV0pO/IU4emV1A0S54/uNlrbXiTKkewqICeA8YDJ2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264226; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zIzFwtv5BgrRQiKa55Xo32yjkjwq+lDenA2mNA+mb7Y=; b=BeV5w5T0p+s2cv5PDKvZMowzpet08hKskR4nLMZaB0BZIlWY1KeXxffeFuu90W0696WCLs96G7PXonirma5NFcqOHkj6JVIplnJ54C5ATFLi0x0NHDqW0lEpCTGpx5UM9WXgX8T6RwYUt1Zu2NENknNJK3nP2xafAVAYfmxarOE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631264226140464.09493047231626; Fri, 10 Sep 2021 01:57:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-UK1bkg69OJeso3_JcJMl6w-1; Fri, 10 Sep 2021 04:57:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57607835DE5; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D544369A; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 07C5B4EA39; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8ucq3026314 for ; Fri, 10 Sep 2021 04:56:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6FA781972E; Fri, 10 Sep 2021 08:56:38 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA94919C79; Fri, 10 Sep 2021 08:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264225; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zIzFwtv5BgrRQiKa55Xo32yjkjwq+lDenA2mNA+mb7Y=; b=KdM0wj3J+iKpxyigtu4zKUkWDukDpM0XRcUdZEDImvDtKioOUBUc6MjXb3Rdkv9UJak/8Y EKSZe5r1swamvKjjxLImtfchTAK5u8c4GPLw1HuaAm7Ezf0vyPRfYFKbMVMsNZiWOnuOxI xdCuzjINNWWjSgH29H7wP+j40BNuEKc= X-MC-Unique: UK1bkg69OJeso3_JcJMl6w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/7] ci: remove obsolete refresh documentation Date: Fri, 10 Sep 2021 09:56:25 +0100 Message-Id: <20210910085626.943674-7-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264227601100001 We now use lcitool's manifest feature to generate files. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- ci/containers/README.rst | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 ci/containers/README.rst diff --git a/ci/containers/README.rst b/ci/containers/README.rst deleted file mode 100644 index f2ee132613..0000000000 --- a/ci/containers/README.rst +++ /dev/null @@ -1,36 +0,0 @@ -CI job assets -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -This directory contains assets used in the automated CI jobs, most -notably the Dockerfiles used to build container images in which the -CI jobs then run. - -The ``refresh`` script is used to re-create the Dockerfiles using the -``lcitool`` command that is provided by repo -https://gitlab.com/libvirt/libvirt-ci - -The containers are built during the CI process and cached in the GitLab -container registry of the project doing the build. The cached containers -can be deleted at any time and will be correctly rebuilt. - - -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 - -This will be used only by the main repository for master branch by running -scheduled pipeline in GitLab. - -The service is proved by `Coverity Scan`_ and requires that the project is -registered there to get free coverity analysis which we already have for -`libvirt project`_. - -To run the coverity job it requires two new variables: - - * ``COVERITY_SCAN_PROJECT_NAME``, containing the `libvirt project`_ - name. - - * ``COVERITY_SCAN_TOKEN``, token visible to admins of `libvirt project`_ - - -.. _Coverity Scan: https://scan.coverity.com/ -.. _libvirt project: https://scan.coverity.com/projects/libvirt --=20 2.31.1 From nobody Sat Apr 27 05:15:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264229; cv=none; d=zohomail.com; s=zohoarc; b=GbL5h620DdM1afQlALze4VFiqOm3oF/i1P38HXmr6FGznCzoJQWoEFIqzHfyRBH3TUgvqC/SELhDV1Kz+ULMSiA27XTvkz9/1nyb8K6sr2pI6nKaXUIckWDtBlcknekyiO+kyl0dIQT9v6Y0uHIZ4yeGiBfa89Lx2fmgQ5BujAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264229; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hSKihpr4w7/P99X1TNCEHEkA1gU7K37R+yUH6XP1ysk=; b=K5/OWlIidgpu+tvsIBw2kPXwT9sdT59gsbmyIH8A7QOSOe/iXXWNom8k3s9E/MBNGRiKEEiMIgVuVQcS878S0jfbJCaurcxQjgS58HEM/7z3oW5GRbFJC9Sn78BIr1sMnjjMpromroLPd1xBePXmM09vY/HdSvLFzJ2xDOAxGdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631264229844890.6189748428263; Fri, 10 Sep 2021 01:57:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-bnJdKJapPGSVkW2LDgjVHw-1; Fri, 10 Sep 2021 04:57:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FFC6108468C; Fri, 10 Sep 2021 08:57:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 025B577F2D; Fri, 10 Sep 2021 08:57:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C39151806D00; Fri, 10 Sep 2021 08:57:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8udRW026327 for ; Fri, 10 Sep 2021 04:56:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 66F3019736; Fri, 10 Sep 2021 08:56:39 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE54719C79; Fri, 10 Sep 2021 08:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264228; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hSKihpr4w7/P99X1TNCEHEkA1gU7K37R+yUH6XP1ysk=; b=G5A/V/HJIQoHbjyZds8cWip227mpeSLM2GWZbKChcyGj/XNWYKU7t4qvZkjcI3917r9UNw OCUhzLqkJ6SSJnLS7OrdPDEwU4QjA4qyVJ8WtXFlw8A3PZNG96+XIHNE6kcdhb19eIZGSA hnvdeQDO9HnRKsSjH//hzLrxI6n7YqY= X-MC-Unique: bnJdKJapPGSVkW2LDgjVHw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] ci: remove obsolete logic for refreshing containers/cirrus Date: Fri, 10 Sep 2021 09:56:26 +0100 Message-Id: <20210910085626.943674-8-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264231989100001 We now use lcitool's manifest feature to generate files. The logic for checking for stale containers in the registry, however, is still relevant so that is propagated to a standalone command. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- ci/helper | 121 ++++------------------------------------------------- ci/util.py | 32 +++++++------- 2 files changed, 23 insertions(+), 130 deletions(-) diff --git a/ci/helper b/ci/helper index 441258f511..8b8d0f68cb 100755 --- a/ci/helper +++ b/ci/helper @@ -7,7 +7,6 @@ import argparse import os import pathlib import pty -import shutil import subprocess import sys import textwrap @@ -60,15 +59,6 @@ class Parser: help=3D"additional arguments passed to ninja", ) =20 - # Options that are common to all actions that use lcitool - lcitoolparser =3D argparse.ArgumentParser(add_help=3DFalse) - lcitoolparser.add_argument( - "--lcitool", - metavar=3D"PATH", - default=3D"lcitool", - help=3D"path to lcitool binary", - ) - # Options that are common to actions communicating with a GitLab # instance gitlabparser =3D argparse.ArgumentParser(add_help=3DFalse) @@ -127,27 +117,14 @@ class Parser: ) listimagesparser.set_defaults(func=3DApplication._action_list_imag= es) =20 - # refresh action - refreshparser =3D subparsers.add_parser( - "refresh", - help=3D"refresh data generated with lcitool", - parents=3D[lcitoolparser, gitlabparser], + # check_stale action + check_staleparser =3D subparsers.add_parser( + "check-stale", + help=3D"check for existence of stale images on the GitLab inst= ance", + parents=3D[gitlabparser], formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, ) - refreshparser.add_argument( - "--quiet", - action=3D"store_true", - default=3DFalse, - help=3D"refresh data silently" - ) - refreshparser.add_argument( - "--check-stale", - action=3D"store", - choices=3D["yes", "no"], - default=3D"yes", - help=3D"check for existence of stale images on the GitLab inst= ance" - ) - refreshparser.set_defaults(func=3DApplication._action_refresh) + check_staleparser.set_defaults(func=3DApplication._action_check_st= ale) =20 def parse(self): return self._parser.parse_args() @@ -158,10 +135,6 @@ class Application: self._basedir =3D pathlib.Path(__file__).resolve().parent self._args =3D Parser().parse() =20 - if self._args.action =3D=3D "refresh": - if not shutil.which(self._args.lcitool): - sys.exit("error: 'lcitool' not installed") - def _make_run(self, target): args =3D [ "-C", @@ -194,84 +167,12 @@ class Application: output =3D self._lcitool_run(["targets"]) return output.splitlines() =20 - def _generate_dockerfile(self, target, cross=3DNone): - args =3D ["dockerfile", target, "libvirt"] - outdir =3D self._basedir.joinpath("containers") - outfile =3D f"{target}.Dockerfile" - - if cross: - args.extend(["--cross", cross]) - outfile =3D f"{target}-cross-{cross}.Dockerfile" - - outpath =3D outdir.joinpath(outfile) - if not self._args.quiet: - print(outpath) - - output =3D self._lcitool_run(args) - with open(outpath, "w") as f: - f.write(output) - - def _generate_vars(self, target): - args =3D ["variables", target, "libvirt"] - outdir =3D self._basedir.joinpath("cirrus") - outfile =3D f"{target}.vars" - - outpath =3D outdir.joinpath(outfile) - if not self._args.quiet: - print(outpath) - - output =3D self._lcitool_run(args) - with open(outpath, "w") as f: - f.write(output) - - def _refresh_containers(self): - debian_cross =3D [ - "aarch64", - "armv6l", - "armv7l", - "i686", - "mips", - "mips64el", - "mipsel", - "ppc64le", - "s390x", - ] - fedora_cross =3D [ - "mingw32", - "mingw64", - ] - - for target in self._lcitool_get_targets(): - if target.startswith("freebsd-") or target.startswith("macos-"= ): - continue - - self._generate_dockerfile(target) - - if target =3D=3D "fedora-rawhide": - for cross in fedora_cross: - self._generate_dockerfile(target, cross) - - if target.startswith("debian-"): - for cross in debian_cross: - if target =3D=3D "debian-sid" and cross =3D=3D "mips": - continue - self._generate_dockerfile(target, cross) - - def _refresh_cirrus(self): - for target in self._lcitool_get_targets(): - if not (target.startswith("freebsd-") or target.startswith("ma= cos-")): - continue - - self._generate_vars(target) - def _check_stale_images(self): namespace =3D self._args.namespace gitlab_uri =3D self._args.gitlab_uri registry_uri =3D util.get_registry_uri(namespace, gitlab_uri) - lcitool_targets =3D self._lcitool_get_targets() =20 - stale_images =3D util.get_registry_stale_images(registry_uri, - lcitool_targets) + stale_images =3D util.get_registry_stale_images(registry_uri, self= ._basedir) if stale_images: spacing =3D "\n" + 4 * " " stale_fmt =3D [f"{k} (ID: {v})" for k, v in stale_images.items= ()] @@ -328,12 +229,8 @@ class Application: print("Available cross-compiler container images:\n") print(spacing + ("\n" + spacing).join(cross)) =20 - def _action_refresh(self): - self._refresh_containers() - self._refresh_cirrus() - - if self._args.check_stale =3D=3D "yes" and not self._args.quiet: - self._check_stale_images() + def _action_check_stale(self): + self._check_stale_images() =20 def run(self): self._args.func(self) diff --git a/ci/util.py b/ci/util.py index 90d58454be..d8be6631eb 100644 --- a/ci/util.py +++ b/ci/util.py @@ -1,4 +1,5 @@ import json +import pathlib import urllib.request import urllib.parse =20 @@ -40,42 +41,37 @@ def get_registry_images(uri: str) -> List[Dict]: return json.loads(r.read().decode()) =20 =20 -def get_image_distro(image_name: str) -> str: +def get_dockerfiles(base_dir) -> List: """ - Extract the name of the distro in the GitLab image registry name, e.g. - ci-debian-9-cross-mipsel --> debian-9 + List all container dockerfiles in the local directory. =20 - :param image_name: name of the GitLab registry image - :return: distro name as a string + :return: list of dockerfile names """ - name_prefix =3D "ci-" - name_suffix =3D "-cross-" =20 - distro =3D image_name[len(name_prefix):] + dkrs =3D [] + d =3D pathlib.Path(base_dir, "containers") + for f in d.iterdir(): + if f.suffix =3D=3D ".Dockerfile": + dkrs.append(f.stem) + return dkrs =20 - index =3D distro.find(name_suffix) - if index > 0: - distro =3D distro[:index] =20 - return distro - - -def get_registry_stale_images(registry_uri: str, - supported_distros: List[str]) -> Dict[str, i= nt]: +def get_registry_stale_images(registry_uri: str, base_dir: str) -> Dict[st= r, int]: """ Check the GitLab image registry for images that we no longer support a= nd which should be deleted. =20 :param uri: URI pointing to a GitLab instance's image registry - :param supported_distros: list of hosts supported by lcitool + :param base_dir: local repository base directory :return: dictionary formatted as: {: } """ =20 + dockerfiles =3D get_dockerfiles(base_dir) images =3D get_registry_images(registry_uri) =20 stale_images =3D {} for img in images: - if get_image_distro(img["name"]) not in supported_distros: + if img["name"][3:] not in dockerfiles: stale_images[img["name"]] =3D img["id"] =20 return stale_images --=20 2.31.1