From nobody Wed May 8 02:17:34 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=1615570151; cv=none; d=zohomail.com; s=zohoarc; b=f+pi1yIHXfArW9FV9YSUi8yETPGqfaI8ZZJe8Km+kwQOIDEPyRetd9Jg0zwto4BAeEjUZ6+PJiEGzGoiYX8p6VsnufbWGsUje9+yP9eqdRkWlE3TjvVi0WeLGpIzLf9DGjpdwX+RZAW90um+oh5A4iuDUVt28DWzCSQ6HaRYBbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570151; 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=qDpd6B24a8hBMXNjjJcE3ILeTIwyU/rjfcOQECXNyq0=; b=RM1k8XEnnLg45UwnZlcPmZqJ20wyDAw06+AvKJSXKgpMje5UsTy8xMz7ggSkYFNifPS55R0UAFe0iQhB23Okouoq8n4K6xdEfuIuyGeX49nek1w1RqlW3gQZmFxBSXV3yvzeYMzfUPw7QC6N0pbn15HpXuQd/vT5S5BczuVHwcg= 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) header.from= 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 1615570151759835.1250105386293; Fri, 12 Mar 2021 09:29:11 -0800 (PST) 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-382-jDyBPpsBOpes6LU07VkQcw-1; Fri, 12 Mar 2021 12:28:38 -0500 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 01C3D1B2C981; Fri, 12 Mar 2021 17:28:33 +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 CBD845D6D7; Fri, 12 Mar 2021 17:28:32 +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 60D231800232; Fri, 12 Mar 2021 17:28:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSUqW031319 for ; Fri, 12 Mar 2021 12:28:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id CB46B5D6D7; Fri, 12 Mar 2021 17:28:30 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B1FA5D6BA for ; Fri, 12 Mar 2021 17:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570150; 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=qDpd6B24a8hBMXNjjJcE3ILeTIwyU/rjfcOQECXNyq0=; b=dwdOtP1/LcZt7HPgS+A8zPxYnj25UKS8oq4Ykx9DoTz2tYMiQj+wxJyceLn8k907MZyOwI uNCjt2AhoF1vHdB55OhuoK9rIBB7zjvwhtv75W9ydlCdhlAbdySqiAyki8GDGfiOxgcijv vHz/ANk7TMyBF1KcW1hGkyMgVAeOlNc= X-MC-Unique: jDyBPpsBOpes6LU07VkQcw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 01/10] syntax-check: Allow exceptions for sc_prohibit_nonreentrant Date: Fri, 12 Mar 2021 18:28:13 +0100 Message-Id: <20210312172822.244833-2-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We're going to need it in a bit. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- build-aux/syntax-check.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 794ec326e4..c5a1b05f60 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -497,6 +497,7 @@ sc_prohibit_PATH_MAX: include $(top_srcdir)/build-aux/Makefile.nonreentrant sc_prohibit_nonreentrant: @prohibit=3D"\\<(${NON_REENTRANT_RE}) *\\(" \ + exclude=3D'exempt from syntax-check' \ halt=3D"use re-entrant functions (usually ending with _r)" \ $(_sc_search_regexp) =20 --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570129; cv=none; d=zohomail.com; s=zohoarc; b=kTGgXImW66W2VLQhSAJItHKeQ5zNZKvcK2oLoAaLYLSYOthJ1+w6+0yrfTWLiIlMuZsr+FkiULEc0NIT4GaADKYFOtnE9TOkJstLJ1kbG4sQV215ZfIG/f3y9fDDRFFGUjnpn7h3UwU0wbf6arxkA0ledH3yxwCCsWB58y+PJpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570129; 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=agfftrzK2CPKTvC2LCzAOKhN3XyhPsEQuTlupuJbjow=; b=buSRy5PcSZMItiN4MLFp/RpWFnxBuM5g2dPpF4QipNACKVH1sZJsSUd9fyp+8MR6hnNL0gNVBTcQYl4LmZwjuVMD/Mixs4vzKm/04751A0kCBMODqiFLu0oau7dTWdkvxfx0Muz9BTWLHvJ64SWBtCEd+bijNfj5LdGJVcraHRQ= 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) header.from= 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 1615570129144598.5649450313985; Fri, 12 Mar 2021 09:28:49 -0800 (PST) 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-143--RY5GjbNOy6YFLbfHnt1Wg-1; Fri, 12 Mar 2021 12:28:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 484CC1B2C985; Fri, 12 Mar 2021 17:28:39 +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 1B18119744; Fri, 12 Mar 2021 17:28:39 +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 C550E1800847; Fri, 12 Mar 2021 17:28:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSWjE031329 for ; Fri, 12 Mar 2021 12:28:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1F2895D6D7; Fri, 12 Mar 2021 17:28:32 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 515DC5D6BA for ; Fri, 12 Mar 2021 17:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570128; 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=agfftrzK2CPKTvC2LCzAOKhN3XyhPsEQuTlupuJbjow=; b=G7QTy4tXxMxtY3EAA8ZeZCrcFTWTSkHjCvmo5P8ks/cMp6XMfMZ5RyPMDubeb82gOEfkSM 6zuZ7GLXFIM1xkMTOJrLNhrD0T7QZVHAq2t3O6d5pQU9OyD8WEmGSi4iDdyrh5aMT2UkfF ryKCuyC6DQlp0hfrCjFYEeIqRHcVLhs= X-MC-Unique: -RY5GjbNOy6YFLbfHnt1Wg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 02/10] ci: Fix name for ci-test target in help output Date: Fri, 12 Mar 2021 18:28:14 +0100 Message-Id: <20210312172822.244833-3-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The target was renamed when moving to Meson, but the help text was not updated accordingly. Fixes: 1a0af38ae75262390061b8d07681b50f82e500fc Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Makefile b/ci/Makefile index c4585ae95d..fc0d2590db 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -228,7 +228,7 @@ ci-help: @echo "Available targets:" @echo @echo " ci-build@\$$IMAGE - run a default 'ninja' build" - @echo " ci-check@\$$IMAGE - run a 'ninja test'" + @echo " ci-test@\$$IMAGE - run a 'ninja test'" @echo " ci-shell@\$$IMAGE - run an interactive shell" @echo " ci-list-images - list available images" @echo " ci-help - show this help message" --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570132; cv=none; d=zohomail.com; s=zohoarc; b=PWfneSR8F8WwlDWIT8/M4cNY04YDeVML2F01Q3vI7Ic/JNsjp11CvqnKbBiG3+kNg0R08OBfjKhwDkuNGrQ6FCqI/ayXCxIIw+R5bCVAiZfBXIJnLMpPLWPfitxzVF5pHKhktt6sA/rGCKBHHA5SHNEod8NjlU5SbXilDwRSXpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570132; 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=hTO1Bhlo3izDZ8KZjqC7X2e166DhzTfVf99qEggptCw=; b=F4/H1A4MpfMcTcKHz0SbWaajoBeStuSj8MQjpcm6PF5W3EtAc8KFg7K2yfBF4cVdAuS8Y9u20rJgom9e0ylziPnkb5+7TkWyGuv+wi+rVEltpmG42NviSIVqTD+ylgg/bwutBczJmjeRnCVW9pKJzH8aE4kXHIFoCnMkMe8c40M= 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) header.from= 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 1615570132288966.0577075280003; Fri, 12 Mar 2021 09:28:52 -0800 (PST) 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-347-qc2ryWSWMzGVoy_Vd2a8Ew-1; Fri, 12 Mar 2021 12:28:47 -0500 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 0D3C11015C87; Fri, 12 Mar 2021 17:28:40 +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 D767660657; Fri, 12 Mar 2021 17:28:39 +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 8E51B1800848; Fri, 12 Mar 2021 17:28:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSXxs031340 for ; Fri, 12 Mar 2021 12:28:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2D45E5D75F; Fri, 12 Mar 2021 17:28:33 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 87DBE5D6BA for ; Fri, 12 Mar 2021 17:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570131; 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=hTO1Bhlo3izDZ8KZjqC7X2e166DhzTfVf99qEggptCw=; b=IxeoGPGIDwOx0W8yPKdiXYuToIJZ/gF8anFJuurSkptqGid1+SifrYKqRCVohSNQ9q/ePC gjEk1DgyrjuNqJlrPQW2Qg86qRxnrtc2GbaN6TBxepMwCbEKVkZKhxzPxkegy3C76gVIiD 7AtkUw+gMsOZ6d33/OJELWXXKqxgrck= X-MC-Unique: qc2ryWSWMzGVoy_Vd2a8Ew-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 03/10] ci: Add helper script Date: Fri, 12 Mar 2021 18:28:15 +0100 Message-Id: <20210312172822.244833-4-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is intended to be perform a number of CI-related operations that are currently implemented in various different scripts written in various different programming languages. Eventually, all existing functionality will be reimplemented in Python and made available through this single entry point; for now, let's start with a very basic skeleton. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 ci/helper diff --git a/ci/helper b/ci/helper new file mode 100755 index 0000000000..2a59b8e5ab --- /dev/null +++ b/ci/helper @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2021 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# . + +import argparse +import pathlib + + +class Parser: + def __init__(self): + # Main parser + self.parser =3D argparse.ArgumentParser() + subparsers =3D self.parser.add_subparsers( + dest=3D"action", + metavar=3D"ACTION", + ) + subparsers.required =3D True + + def parse(self): + return self.parser.parse_args() + + +class Application: + def __init__(self): + self.basedir =3D pathlib.Path(__file__).resolve().parent + self.args =3D Parser().parse() + + def run(self): + self.args.func(self) + + +if __name__ =3D=3D "__main__": + Application().run() --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570208; cv=none; d=zohomail.com; s=zohoarc; b=NZVCmaWLaiQ/egSiEBSCHcJMtEvKU74809AfY2JTDO6Jb75pwRI3etFJBU58bsJyabn3dCyI1EcS3XStc/Ymd6eIuhWAFV0/nxvMw60DX3pA9rxsmBXQClIv22oTmp6bgiROQJkoaGN2X5Rgds1Eao07uX9Ehzba0vhoYxXk/jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570208; 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=ObhNNVZ4sepBGoGepo06uPkb2b3u4pZq8t70aNKj69w=; b=Bm2HEAdS6YjWUmA2xtgsrVerheaLxwd5l474dwMMzzQqGthTWweVN5SddkDtk0EqIAXUWvOY9VL+M7MbqUi7SAPF4BzVOPxEZjMBYV6W4/1QGAQA52mzdGKEOnc4S3CQDrqW2y7FzqS3kxRgeXSGs4QcJAQQ7Ijdc5q+f1ALGO4= 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) header.from= 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 161557020798276.93855987078973; Fri, 12 Mar 2021 09:30:07 -0800 (PST) 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-525-y81pfs71MCKc-PXX0Usm7Q-1; Fri, 12 Mar 2021 12:28:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F27A51B2C98C; Fri, 12 Mar 2021 17:28:42 +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 C37371002388; Fri, 12 Mar 2021 17:28:42 +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 5C8B81800B99; Fri, 12 Mar 2021 17:28:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSY5X031349 for ; Fri, 12 Mar 2021 12:28:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 33EC85D6D7; Fri, 12 Mar 2021 17:28:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F2CC5D6BA for ; Fri, 12 Mar 2021 17:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570206; 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=ObhNNVZ4sepBGoGepo06uPkb2b3u4pZq8t70aNKj69w=; b=VEzMvRO6G9UWaCtn2Omm5CpsF7ixhR+380tqupP8eVcq09I0MeMHiK2XUFXJNCPVZjOQxE jlv+l3+VJDqJzGaE7KDC6pUGwpeGl7pOlLfl3Fd7gLzRIcabToH6t8rcW2MEZCmPRbw9IA y+5rv5vm3OFldV1ayWD6atV0HM8cFfc= X-MC-Unique: y81pfs71MCKc-PXX0Usm7Q-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 04/10] ci: Implement 'refresh' helper action Date: Fri, 12 Mar 2021 18:28:16 +0100 Message-Id: <20210312172822.244833-5-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This provides the same functionality as the two refresh scripts that are currently in the repository, with the following advantages: * all files are refreshed with a single command; * if lcitool is present in the user's $PATH, it will be discovered and used automatically; * some output is produced, so the user can follow along with the progress of the operation. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/ci/helper b/ci/helper index 2a59b8e5ab..05ecdcb426 100755 --- a/ci/helper +++ b/ci/helper @@ -18,10 +18,22 @@ =20 import argparse import pathlib +import shutil +import subprocess +import sys =20 =20 class Parser: def __init__(self): + # 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", + ) + # Main parser self.parser =3D argparse.ArgumentParser() subparsers =3D self.parser.add_subparsers( @@ -30,6 +42,14 @@ class Parser: ) subparsers.required =3D True =20 + # refresh action + refreshparser =3D subparsers.add_parser( + "refresh", + help=3D"refresh data generated with lcitool", + parents=3D[lcitoolparser], + ) + refreshparser.set_defaults(func=3DApplication.action_refresh) + def parse(self): return self.parser.parse_args() =20 @@ -39,6 +59,88 @@ 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 lcitool_run(self, args): + output =3D subprocess.check_output([self.args.lcitool] + args) + return output.decode("utf-8") + + def lcitool_get_hosts(self): + output =3D self.lcitool_run(["hosts"]) + return output.splitlines() + + def generate_dockerfile(self, host, cross=3DNone): + args =3D ["dockerfile", host, "libvirt"] + outdir =3D self.basedir.joinpath("containers") + outfile =3D f"ci-{host}.Dockerfile" + + if cross: + args.extend(["--cross", cross]) + outfile =3D f"ci-{host}-cross-{cross}.Dockerfile" + + output =3D self.lcitool_run(args) + with open(outdir.joinpath(outfile), "w") as f: + f.write(output) + + def generate_vars(self, host): + args =3D ["variables", host, "libvirt"] + outdir =3D self.basedir.joinpath("cirrus") + outfile =3D f"{host}.vars" + + output =3D self.lcitool_run(args) + with open(outdir.joinpath(outfile), "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 host in self.lcitool_get_hosts(): + if host.startswith("freebsd-") or host.startswith("macos-"): + continue + + print(f"containers/{host}") + self.generate_dockerfile(host) + + if host =3D=3D "fedora-rawhide": + for cross in fedora_cross: + print(f"containers/{host} ({cross})") + self.generate_dockerfile(host, cross) + + if host.startswith("debian-"): + for cross in debian_cross: + if host =3D=3D "debian-sid" and cross =3D=3D "mips": + continue + print(f"containers/{host} ({cross})") + self.generate_dockerfile(host, cross) + + def refresh_cirrus(self): + for host in self.lcitool_get_hosts(): + if not (host.startswith("freebsd-") or host.startswith("macos-= ")): + continue + + print(f"cirrus/{host}") + self.generate_vars(host) + + def action_refresh(self): + self.refresh_containers() + self.refresh_cirrus() + def run(self): self.args.func(self) =20 --=20 2.26.2 From nobody Wed May 8 02:17:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1615570137; cv=none; d=zohomail.com; s=zohoarc; b=MlRLzmSKiWuueWjSJMbFxvmw16byQd8J7YCBp/O86d2o7fgxT/HP0z9mSlRca//aAe7fT0KRM2dHaOopBSorAo5hkYbPsZAjekBrm8hnaounU0nh9jNLwHtUjwSpyVtqERtQMOXuHOl3QLlOldaWNt0SXrCJ2ZHwiXh7nP75cvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570137; 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=KmNYaEaaAefeh65Qk2K68sLrbZMoaKgZOdlWbmGmK38=; b=kDQOzLbmKvlT5EfTYYZaXJKR4S9hzc1aVYMR9iDB1R3CsOvBkWUtVrIYCDlDh83pE2gX+a/Gld/wlJeZu+VDGdo4YcmrRrx21CqOsRfxjqOCilxCb7CJlN/Ric2kaQ3qbPRcg057Ly07k/JBzV21ntQ8k8J8Jg8gwepTWIbV12U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161557013734266.37323478136625; Fri, 12 Mar 2021 09:28:57 -0800 (PST) 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-480-rSFYtC7GP3OlIGiyVWsvpA-1; Fri, 12 Mar 2021 12:28:52 -0500 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 B8A708018A3; Fri, 12 Mar 2021 17:28:46 +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 8775F60C5F; Fri, 12 Mar 2021 17:28:46 +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 418431800BAE; Fri, 12 Mar 2021 17:28:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSZV5031364 for ; Fri, 12 Mar 2021 12:28:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3B0245D6D7; Fri, 12 Mar 2021 17:28:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96FB85D6BA for ; Fri, 12 Mar 2021 17:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570135; 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=KmNYaEaaAefeh65Qk2K68sLrbZMoaKgZOdlWbmGmK38=; b=P3ZHL7f0pDbEg0Y60veVOuRhiqlrFNarUf42AgXR4yS47Njz9wbmX5xUIaHuCJ0PSkmGTp AqSoxD5ghovG9vtKgoX5nPWHTbbl+O+0+b4N7q52bTxQfmuqHzukIH9P4XGIP7n3MNRr9n LrX2TFsMle16tEA5x5LupbE/B1q77Ps= X-MC-Unique: rSFYtC7GP3OlIGiyVWsvpA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 05/10] ci: Implement 'list-images' helper action Date: Fri, 12 Mar 2021 18:28:17 +0100 Message-Id: <20210312172822.244833-6-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This simply calls the underlying Makefile target. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ci/helper b/ci/helper index 05ecdcb426..420e9b73c2 100755 --- a/ci/helper +++ b/ci/helper @@ -18,6 +18,7 @@ =20 import argparse import pathlib +import pty import shutil import subprocess import sys @@ -42,6 +43,13 @@ class Parser: ) subparsers.required =3D True =20 + # list-images action + listimagesparser =3D subparsers.add_parser( + "list-images", + help=3D"list known container images", + ) + listimagesparser.set_defaults(func=3DApplication.action_list_image= s) + # refresh action refreshparser =3D subparsers.add_parser( "refresh", @@ -63,6 +71,16 @@ class Application: if not shutil.which(self.args.lcitool): sys.exit("error: 'lcitool' not installed") =20 + def make_run(self, target): + args =3D [ + "-C", + self.basedir, + target, + ] + + if pty.spawn(["make"] + args) !=3D 0: + sys.exit("error: 'make' failed") + def lcitool_run(self, args): output =3D subprocess.check_output([self.args.lcitool] + args) return output.decode("utf-8") @@ -137,6 +155,9 @@ class Application: print(f"cirrus/{host}") self.generate_vars(host) =20 + def action_list_images(self): + self.make_run(f"ci-list-images") + def action_refresh(self): self.refresh_containers() self.refresh_cirrus() --=20 2.26.2 From nobody Wed May 8 02:17:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1615570140; cv=none; d=zohomail.com; s=zohoarc; b=VHZ3YkvWnhgyWvD5GbkTKUg0xzNYW2RNLfaYUQAPXqaand6/Ch0SCLKEJEod8ZDPeazWywPzgRYJZ3/e3fo7HuoDwZawpuAaeKFk1Yr5yijzkYu+avzOJ6U1GjYDH7hlf1uCCICqFJ6k0xxgxwvKIAGCwvoHu+cIdumD3f3FJw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570140; 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=eggIuAHOcs8Ugso6X1MAK7KkVV4aZSWEueJdgoxMgOI=; b=czIXFH4dpRjh3rGrB4XzKO5VJEhMJJxAJqwAVxxE+tmcTcHZlBjrWgpFuro4lCMHw9ex+bahGozkKTN6JqXWFUdIsulXa7Mec8+ZHpfOGLQ+9prRX9/3SQeXg7kKgvAl5PhT6RBmDTAZW4HohGgS/jdd3Prb6M/gykxKYfi9Rq4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1615570140771848.8488238567228; Fri, 12 Mar 2021 09:29:00 -0800 (PST) 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-524-18IXvLzwP6SxZI_LG6Od1Q-1; Fri, 12 Mar 2021 12:28:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53094107ACCA; Fri, 12 Mar 2021 17:28:50 +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 300465C232; Fri, 12 Mar 2021 17:28:50 +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 E4CBF57DC5; Fri, 12 Mar 2021 17:28:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSdWd031401 for ; Fri, 12 Mar 2021 12:28:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id A25AA5D6D7; Fri, 12 Mar 2021 17:28:39 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD2055D75F for ; Fri, 12 Mar 2021 17:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570139; 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=eggIuAHOcs8Ugso6X1MAK7KkVV4aZSWEueJdgoxMgOI=; b=Fs6Y1Q81URJzSDsmvKFH2BTP9L2ACn6rfPM2MhhBOrbGmiHURgPMBUa1d/Lu2W8OCRsvtP RygwHlPeez5IJVUe96ZrsOL9ZhMoEgiA5SMVIyZKn38RHz1TM5yWkYbbYMl2ZGzz5NoC77 2SpJXtwXuCt1v++fPLtr1sbmO0SOUYI= X-MC-Unique: 18IXvLzwP6SxZI_LG6Od1Q-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 06/10] ci: Implement 'shell' helper action Date: Fri, 12 Mar 2021 18:28:18 +0100 Message-Id: <20210312172822.244833-7-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This simply calls the underlying Makefile target, but allows additional arguments to be specified in a more convenient and discoverable way. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/ci/helper b/ci/helper index 420e9b73c2..8eb521ae40 100755 --- a/ci/helper +++ b/ci/helper @@ -17,6 +17,7 @@ # . =20 import argparse +import os import pathlib import pty import shutil @@ -26,6 +27,34 @@ import sys =20 class Parser: def __init__(self): + # Options that are common to all actions that use containers + containerparser =3D argparse.ArgumentParser(add_help=3DFalse) + containerparser.add_argument( + "target", + help=3D"build on target OS", + ) + containerparser.add_argument( + "--engine", + choices=3D["auto", "podman", "docker"], + default=3D"auto", + help=3D"container engine to use", + ) + containerparser.add_argument( + "--login", + default=3Dos.getlogin(), # exempt from syntax-check + help=3D"login to use inside the container", + ) + containerparser.add_argument( + "--image-prefix", + default=3D"registry.gitlab.com/libvirt/libvirt/ci-", + help=3D"use container images from non-default location", + ) + containerparser.add_argument( + "--image-tag", + default=3D":latest", + help=3D"use container images with non-default tags", + ) + # Options that are common to all actions that use lcitool lcitoolparser =3D argparse.ArgumentParser(add_help=3DFalse) lcitoolparser.add_argument( @@ -43,6 +72,14 @@ class Parser: ) subparsers.required =3D True =20 + # shell action + shellparser =3D subparsers.add_parser( + "shell", + help=3D"start a shell in a container", + parents=3D[containerparser], + ) + shellparser.set_defaults(func=3DApplication.action_shell) + # list-images action listimagesparser =3D subparsers.add_parser( "list-images", @@ -78,6 +115,14 @@ class Application: target, ] =20 + if self.args.action =3D=3D "shell": + args.extend([ + f"CI_ENGINE=3D{self.args.engine}", + f"CI_USER_LOGIN=3D{self.args.login}", + f"CI_IMAGE_PREFIX=3D{self.args.image_prefix}", + f"CI_IMAGE_TAG=3D{self.args.image_tag}", + ]) + if pty.spawn(["make"] + args) !=3D 0: sys.exit("error: 'make' failed") =20 @@ -155,6 +200,9 @@ class Application: print(f"cirrus/{host}") self.generate_vars(host) =20 + def action_shell(self): + self.make_run(f"ci-shell@{self.args.target}") + def action_list_images(self): self.make_run(f"ci-list-images") =20 --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570210; cv=none; d=zohomail.com; s=zohoarc; b=H8UxkI8gomj6mhUFeTbDQM723Orsbn5zZ3bwFrncHDUViRphvW08/e+G/N/hPk1U78UcRy5Xmm/8wMPqc8gIoF4FkqOQJygDUpgGpTM65YcAHcRRokhtQrR+fVJxEOp9s9jweuTBS4S8LQnSQEiFR60RB0neQiS2ElaA+H59nBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570210; 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=f/+Rd7M1DxlW0QHlW8nMoP+AgdiD4MWUx/bFkOPJE0o=; b=jPxwuYTBumfVwLGAJkv/j+WK4fZ/hmKC3WoYKwQfRjPDRRWDP1wACMNCdQwG2olCoB00rq2aGKnjlyuv6qrC6X0G/FiuMd6HivM+G/v9Jkrs1fXDEHyUeb68t0iTjznk0PwnHH+5TeEvgrjOvgYlVN7D7kAqIr18Llwwv5RKvJE= 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) header.from= 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 1615570210563229.18537251102157; Fri, 12 Mar 2021 09:30:10 -0800 (PST) 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-567-pt3YsNSzPTqPenIu-91R5w-1; Fri, 12 Mar 2021 12:28:49 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8232851FE; Fri, 12 Mar 2021 17:28:43 +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 4D14922E20; Fri, 12 Mar 2021 17:28:43 +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 F0AFE180121E; Fri, 12 Mar 2021 17:28:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSesR031410 for ; Fri, 12 Mar 2021 12:28:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id EFC705D6D7; Fri, 12 Mar 2021 17:28:40 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 109365D75F for ; Fri, 12 Mar 2021 17:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570209; 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=f/+Rd7M1DxlW0QHlW8nMoP+AgdiD4MWUx/bFkOPJE0o=; b=I7DCnT9kGGxxstzv+/Ad36PCQzqc7t/1NetnRV9My/0A4M8aZr+i0TUM/ut2+T20WeWDid zuVCwzhNKXilNmjfh8LUSGppaUpnssf9CtZZeIpCnVoeI5DK0TGb/H1q6yA22+vQL8Ymb+ ofq4SZrnHE5HEoUbb2PO9LgTmKZjiNI= X-MC-Unique: pt3YsNSzPTqPenIu-91R5w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 07/10] ci: Implement 'build' helper action Date: Fri, 12 Mar 2021 18:28:19 +0100 Message-Id: <20210312172822.244833-8-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This simply calls the underlying Makefile target, but allows additional arguments to be specified in a more convenient and discoverable way. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/ci/helper b/ci/helper index 8eb521ae40..4a552595df 100755 --- a/ci/helper +++ b/ci/helper @@ -55,6 +55,20 @@ class Parser: help=3D"use container images with non-default tags", ) =20 + # Options that are common to all actions that call the + # project's build system + mesonparser =3D argparse.ArgumentParser(add_help=3DFalse) + mesonparser.add_argument( + "--meson-args", + default=3D"", + help=3D"additional arguments passed to meson", + ) + mesonparser.add_argument( + "--ninja-args", + default=3D"", + help=3D"additional arguments passed to ninja", + ) + # Options that are common to all actions that use lcitool lcitoolparser =3D argparse.ArgumentParser(add_help=3DFalse) lcitoolparser.add_argument( @@ -72,6 +86,14 @@ class Parser: ) subparsers.required =3D True =20 + # build action + buildparser =3D subparsers.add_parser( + "build", + help=3D"run a build in a container", + parents=3D[containerparser, mesonparser], + ) + buildparser.set_defaults(func=3DApplication.action_build) + # shell action shellparser =3D subparsers.add_parser( "shell", @@ -115,7 +137,7 @@ class Application: target, ] =20 - if self.args.action =3D=3D "shell": + if self.args.action in ["build", "shell"]: args.extend([ f"CI_ENGINE=3D{self.args.engine}", f"CI_USER_LOGIN=3D{self.args.login}", @@ -123,6 +145,12 @@ class Application: f"CI_IMAGE_TAG=3D{self.args.image_tag}", ]) =20 + if self.args.action =3D=3D "build": + args.extend([ + f"CI_MESON_ARGS=3D{self.args.meson_args}", + f"CI_NINJA_ARGS=3D{self.args.ninja_args}", + ]) + if pty.spawn(["make"] + args) !=3D 0: sys.exit("error: 'make' failed") =20 @@ -200,6 +228,9 @@ class Application: print(f"cirrus/{host}") self.generate_vars(host) =20 + def action_build(self): + self.make_run(f"ci-build@{self.args.target}") + def action_shell(self): self.make_run(f"ci-shell@{self.args.target}") =20 --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570136; cv=none; d=zohomail.com; s=zohoarc; b=WFOuHo5Xgwszu4OtMvGkjDM5vI2h1AZMkvNDs1VJz50mrE0BnWePr46UNUbSuM/99UC6EhkDwmfYRVVe0e6xmCjQer5jiXQI57mNA93ogK9/9+SXk8Gh2nHOEeIZsz/maBcFTayCwyA5HueB/s9VL0UE/3bb9if3y6TMy53OPL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570136; 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=ICytadiYx/nIl9Xab8ILap54eOukdt+92paXtA9Bu4U=; b=fLCL2cFa1T02pn065uSK9NqnsPCGPfQJLbxa0ctYLAsUCz/XphjMBmMNOwDURQj2tBfsEIKk3lTF1pDrCl7dzwF8+cdWJBcs9q6QWyBolJ3VjFofwYZ41TIT2r8KxPvLavEWlAecsYnwjH62KZt5KkPq4QU8I4x+sNt1+ZgE0UQ= 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) header.from= 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 1615570136121160.81324696160834; Fri, 12 Mar 2021 09:28:56 -0800 (PST) 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-379-IbsdXhdNNeCFFODXIjkHlA-1; Fri, 12 Mar 2021 12:28:50 -0500 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 30495801817; Fri, 12 Mar 2021 17:28:44 +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 02F2060C5F; Fri, 12 Mar 2021 17:28:44 +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 A6F1B57DC5; Fri, 12 Mar 2021 17:28:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSgEf031426 for ; Fri, 12 Mar 2021 12:28:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 33C525D760; Fri, 12 Mar 2021 17:28:42 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7ED7A5D6D7 for ; Fri, 12 Mar 2021 17:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570134; 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=ICytadiYx/nIl9Xab8ILap54eOukdt+92paXtA9Bu4U=; b=OS0WNodbR5loUBsR94apQ5GTgOUUQZFF8To/Uv80+sr+XiWFIvLnWSq8aHkwnoz38z6nh7 3bKQG+5HULFy6kjuWnVh0oZ2it42njTPeRShng2PHhiXwDoIJy+Y3A0hkpABgRWtRqFJNe A0rToXQBmnUJhtpILZRlhAs4LUu7CEg= X-MC-Unique: IbsdXhdNNeCFFODXIjkHlA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 08/10] ci: Implement 'test' helper action Date: Fri, 12 Mar 2021 18:28:20 +0100 Message-Id: <20210312172822.244833-9-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This simply calls the underlying Makefile target, but allows additional arguments to be specified in a more convenient and discoverable way. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/helper | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ci/helper b/ci/helper index 4a552595df..4d6dfab19b 100755 --- a/ci/helper +++ b/ci/helper @@ -94,6 +94,14 @@ class Parser: ) buildparser.set_defaults(func=3DApplication.action_build) =20 + # test action + testparser =3D subparsers.add_parser( + "test", + help=3D"run a build in a container (including tests)", + parents=3D[containerparser, mesonparser], + ) + testparser.set_defaults(func=3DApplication.action_test) + # shell action shellparser =3D subparsers.add_parser( "shell", @@ -137,7 +145,7 @@ class Application: target, ] =20 - if self.args.action in ["build", "shell"]: + if self.args.action in ["build", "test", "shell"]: args.extend([ f"CI_ENGINE=3D{self.args.engine}", f"CI_USER_LOGIN=3D{self.args.login}", @@ -145,7 +153,7 @@ class Application: f"CI_IMAGE_TAG=3D{self.args.image_tag}", ]) =20 - if self.args.action =3D=3D "build": + if self.args.action in ["build", "test"]: args.extend([ f"CI_MESON_ARGS=3D{self.args.meson_args}", f"CI_NINJA_ARGS=3D{self.args.ninja_args}", @@ -231,6 +239,9 @@ class Application: def action_build(self): self.make_run(f"ci-build@{self.args.target}") =20 + def action_test(self): + self.make_run(f"ci-test@{self.args.target}") + def action_shell(self): self.make_run(f"ci-shell@{self.args.target}") =20 --=20 2.26.2 From nobody Wed May 8 02:17:34 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=1615570139; cv=none; d=zohomail.com; s=zohoarc; b=Oh1aQcSnhpX06BBCsuhJRoCz2DtKHQrt28sh5a1e1bUuf491M6Z34BjXPoyNCHLpiS27su/vJqT9w6iRx+rGLA8mupS10jLkLF8VufrjirTeXZu7aAzkVn51tBWtoOIe8ylj+wH8JMllK2ukju4ovU7iygdaAqnGlNU0ESYMvh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570139; 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=fIAqRx6JkuCYgwSTgJ6AiZ1bUOzMmbe9mrvdIjIADyc=; b=mKDqrvyu3iKkgGyWpExE+O5tbG3G3XCVLajXh9FmpoeaOL8B95/u3Xynnt1vJ1l+A/zWh2jnuOayRudF7ounC/pDXI7+KQbNqVsCy4bDERKOq+XrnZIhNpVgV+pQubDL54KQnytLHzUG8iZ3hA4UpeInylnE8SRs/6MHnQdPK/o= 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) header.from= 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 1615570139697114.72980894850389; Fri, 12 Mar 2021 09:28:59 -0800 (PST) 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-385-Q29CLpUpPm6siMxd9ZazrA-1; Fri, 12 Mar 2021 12:28:56 -0500 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 BA6AE5155; Fri, 12 Mar 2021 17:28:47 +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 93A175D75F; Fri, 12 Mar 2021 17:28:47 +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 4DB3F57DC7; Fri, 12 Mar 2021 17:28:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHShf8031439 for ; Fri, 12 Mar 2021 12:28:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id B638D5D75F; Fri, 12 Mar 2021 17:28:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C561E5D761 for ; Fri, 12 Mar 2021 17:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570138; 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=fIAqRx6JkuCYgwSTgJ6AiZ1bUOzMmbe9mrvdIjIADyc=; b=iVI/PCbsSp2bYtWXuTc/GgS0fx+pRMZpOD2kBx5RK4jF7qPAJ9WuTFVPf95b+2c1YoHgjs qwdNV+Ar2V/wIRStp5nxXjYsSqWzDMRjOCvVzUxVxDcUouzKW3hjfGwLI7DKGzNTKIu+Av uHrBabc4VWbtfJWfxiNaFqIvpUNbBKw= X-MC-Unique: Q29CLpUpPm6siMxd9ZazrA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 09/10] ci: Delete refresh scripts Date: Fri, 12 Mar 2021 18:28:21 +0100 Message-Id: <20210312172822.244833-10-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The functionality is now available in the ci/helper script. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/cirrus/refresh | 22 ---------------------- ci/containers/refresh | 41 ----------------------------------------- 2 files changed, 63 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh diff --git a/ci/cirrus/refresh b/ci/cirrus/refresh deleted file mode 100755 index 63ca794134..0000000000 --- a/ci/cirrus/refresh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if test -z "$1" -then - echo "syntax: $0 PATH-TO-LCITOOL" - exit 1 -fi - -LCITOOL=3D$1 - -if ! test -x "$LCITOOL" -then - echo "$LCITOOL is not executable" - exit 1 -fi - -HOSTS=3D$($LCITOOL hosts | grep -E 'freebsd|macos') - -for host in $HOSTS -do - $LCITOOL variables "$host" libvirt >"$host.vars" -done diff --git a/ci/containers/refresh b/ci/containers/refresh deleted file mode 100755 index f38d3634b5..0000000000 --- a/ci/containers/refresh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -if test -z "$1" -then - echo "syntax: $0 PATH-TO-LCITOOL" - exit 1 -fi - -LCITOOL=3D$1 - -if ! test -x "$LCITOOL" -then - echo "$LCITOOL is not executable" - exit 1 -fi - -HOSTS=3D$($LCITOOL hosts | grep -Ev 'freebsd|macos') - -for host in $HOSTS -do - case "$host" in - fedora-rawhide) - for cross in mingw32 mingw64 - do - $LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cr= oss-$cross.Dockerfile - done - ;; - debian-*) - for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64= le s390x - do - if test "$host-cross-$cross" =3D "debian-sid-cross-mips" - then - continue - fi - $LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cr= oss-$cross.Dockerfile - done - ;; - esac - - $LCITOOL dockerfile $host libvirt > ci-$host.Dockerfile -done --=20 2.26.2 From nobody Wed May 8 02:17:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1615570141; cv=none; d=zohomail.com; s=zohoarc; b=a1JYGT72n9avzjQS+Ral3XoWWitHCnUKhIRf78a4xU0kUffy1Vh/ysuTImJzyYFLneUhLwoSRDmFknp8GCIp3imonFRf12V3GSoYc7AFvJvbZaxbwUhu1VQjd+DV5cTXj7X84F6y5st8YjClSniVizRJg0gAHL2hj8/lcxjGpks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615570141; 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=0vf2F61drQ+FYrjAjHUiV5AlLDq0K82NXFM1cJ1s7Dc=; b=gdqevTLFmvbB7KiGnvERVDaweUf18VkjcgdIfcNjkXH7c/KX3POQDe3HbucM7NUsNxod69UMFUeEa1cQTec7ZuK6+y3H3IhlukdhabhjKD416B6LJqM3INi9cTD5z6XXdnDJbkQ/NNZ9pOjXTSoEC96g8bqL8cu7iy4x/mttXOU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161557014115645.40782932184163; Fri, 12 Mar 2021 09:29:01 -0800 (PST) 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-416-k4BTWAFDO6ast0OWQEGeFA-1; Fri, 12 Mar 2021 12:28:58 -0500 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 5E7401B2C999; Fri, 12 Mar 2021 17:28:52 +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 34BE460918; Fri, 12 Mar 2021 17:28:52 +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 D22EB57DC9; Fri, 12 Mar 2021 17:28:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12CHSmBk031466 for ; Fri, 12 Mar 2021 12:28:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id D72265D760; Fri, 12 Mar 2021 17:28:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 120085D75F for ; Fri, 12 Mar 2021 17:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615570140; 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=0vf2F61drQ+FYrjAjHUiV5AlLDq0K82NXFM1cJ1s7Dc=; b=R1/9FBsdtBqRW9Kw1+CNi7DFeGr8jmrhbAyrfJ1WvVkbqtxcJz+S7+Bzc3wkF8vdTxpGD4 u+G17FWbN6vKcNdi5IH/FPK2Fwt5+izeb1+Zen+Dyh11PEu15GK0WG/ZENZGdvRP1FnZaH 1WWcQ0VO/eP4zT+baYDU0k/8Mtp4ouA= X-MC-Unique: k4BTWAFDO6ast0OWQEGeFA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 10/10] ci: Discourage users from using the Makefile directly Date: Fri, 12 Mar 2021 18:28:22 +0100 Message-Id: <20210312172822.244833-11-abologna@redhat.com> In-Reply-To: <20210312172822.244833-1-abologna@redhat.com> References: <20210312172822.244833-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We now wrap all its important functionality with the much more user-friendly ci/helper script, and the long term plan is for the Makefile to disappear completely. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- ci/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/Makefile b/ci/Makefile index fc0d2590db..72f5bda942 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -223,6 +223,17 @@ ci-list-images: @echo =20 ci-help: + @echo + @echo + @echo + @echo " !!! PLEASE DON'T USE THIS DIRECTLY !!!" + @echo + @echo " Use the ci/helper script instead" + @echo + @echo " !!! PLEASE DON'T USE THIS DIRECTLY !!!" + @echo + @echo + @echo @echo "Build libvirt inside containers used for CI" @echo @echo "Available targets:" --=20 2.26.2