From nobody Sat May 11 11:43:29 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=1694439846; cv=none; d=zohomail.com; s=zohoarc; b=LaLvWn6ZxizS7PMGhNc77zFD1wn9bor4NvdNcbgQeedQzmU5a2S1YINHjJmqWIykspKLa3LE9O7uxNy4Lp1hXY9NwZm3tOJM4vxlqejGYsDnRvGU2RjFhJZg+lSI35ckoKTe33FcGBUr0lvhlZmaOv2adpPsWi3e+ERgWQ+ihyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439846; h=Content-Type:Content-Transfer-Encoding:Cc: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=F3b8FqmnPYr9BeFQznLDEKE2BN3S/mDYLIVcOPJqaDw=; b=Ni3pIDfqniJLAFU98lZ/B75B4m9PZ3VZ6M1bBpBcsawHFaHRKau3eGzN664AMeLk+98XBgrfsuA9lDf9A2kvR+K/bKWQU6o9Tx/SNOI6aIbvLUYn3r18N249xcifyXeEWkX/SdeAqSvhNTFYkKEAu9OmpqrJbuksjuvPSzTqALc= 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 1694439846429443.5936464350764; Mon, 11 Sep 2023 06:44:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-P3cSEI-BO2yR_qCHD4QrZQ-1; Mon, 11 Sep 2023 09:43:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B83418BE341; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A85340C2020; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1A1271946A4F; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3DC531946597 for ; Mon, 11 Sep 2023 13:43:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1297B2024CDB; Mon, 11 Sep 2023 13:43:39 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8029C2026D4B; Mon, 11 Sep 2023 13:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439845; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=F3b8FqmnPYr9BeFQznLDEKE2BN3S/mDYLIVcOPJqaDw=; b=VJMdSR9lgyTHWGEAwcr+6FTQkSP+QnWCyFisxZumlS5crGmcHTbYGFHjB0yE/7EMWTustg /WJINJRldYw2zDuyzYlT8G6Lzyl8eX50Yp1bIDgS+d1LeE89/EyndXSyT7wqEUZOgL0TPJ WmF7GGG7aFxzhatM5L2VHbv8YFrCBKE= X-MC-Unique: P3cSEI-BO2yR_qCHD4QrZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/35] ci: build.sh: Add variables from .gitlab-ci.yml Date: Mon, 11 Sep 2023 15:43:02 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439848135100001 Content-Type: text/plain; charset="utf-8"; x-default="true" These are common variables we wish to use in containerized environments both in GitLab and locally. Having these defined in a single place rather than twice is highly preferable. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index d5ed8ad104..5a9298c4b4 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -2,7 +2,17 @@ =20 cd "$CI_CONT_SRCDIR" =20 -export VIR_TEST_DEBUG=3D1 +export CCACHE_BASEDIR=3D"$(pwd)" +export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" +export CCACHE_MAXSIZE=3D"500M" +export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" + +# Enable these conditionally since their best use case is during +# non-interactive workloads without having a Shell +if ! [ -t 1 ]; then + export VIR_TEST_VERBOSE=3D"1" + export VIR_TEST_DEBUG=3D"1" +fi =20 # $MESON_OPTS is an env that can optionally be set in the container, # populated at build time from the Dockerfile. A typical use case would --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439841; cv=none; d=zohomail.com; s=zohoarc; b=TLRwNvKdXPNxtmMqWTKWgbzuCUueYWIbQD+DWpJgeci660RWUNs1zLRZLWWJsCH7kg8WF99GdiOroRof+xmxk9uSGqrGcRqIDaCfl3PjQREsOHriv/tc9r2ezY7w7CS53moZXxIuRgfw41/MzjzVfKUCg68oyh3fUes3mAUg4+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439841; h=Content-Type:Content-Transfer-Encoding:Cc: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=GmWcbUO+GA3OpJQZrPQleF9fCmkXcNIBl7sbzsDI+ZA=; b=AIKQxG6jtu4XRhAfiU6UrN1TV8q/XCYyhGnAk2Ybrdv8d4uSUvjLAuVADIPHtELNaNzuwO6NsouZ2U45/ZCXvPoiV40Pm0+Ayf1t8fqyJ7bzZeSlSynCAXjTiwN/BLwjDV2gtdslxbZLWXIGiQV7r/mMYaAklMl9ek+Ha1etaIs= 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 1694439841981431.6319655399186; Mon, 11 Sep 2023 06:44:01 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-DuZl3EUKM9Wa7JChc3FU0w-1; Mon, 11 Sep 2023 09:43:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0B6781652D; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A76A3200E575; Mon, 11 Sep 2023 13:43:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7BAA819465BC; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 33FB919465BA for ; Mon, 11 Sep 2023 13:43:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 07D682022ECD; Mon, 11 Sep 2023 13:43:40 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47ED4200A380; Mon, 11 Sep 2023 13:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439839; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GmWcbUO+GA3OpJQZrPQleF9fCmkXcNIBl7sbzsDI+ZA=; b=gN0bpJeVWtdQcHmO7wmJ2fsA9uw6J+AwBoJIhljFpRWnhf24qx9NFyF/OCKFrFyPHNI8Ka tQWtN1SZxx55mjMYWKBaj12Ozh1x3yBg5rFtAm75Nf6MwTCIT3uB5fGtOmouM0K+Gd9VK+ S7DdaQjp7mZ4FPNsvhtn/n2M42EEmU0= X-MC-Unique: DuZl3EUKM9Wa7JChc3FU0w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 02/35] ci: build.sh: Add GIT_ROOT env helper variable Date: Mon, 11 Sep 2023 15:43:03 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1694439843528100001 We'll use this one in many of the job functions future patches will introduce, it's a neat shortcut to avoid using relative paths. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 5a9298c4b4..0549b01ca0 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -14,6 +14,8 @@ if ! [ -t 1 ]; then export VIR_TEST_DEBUG=3D"1" fi =20 +GIT_ROOT=3D"$(git rev-parse --show-toplevel)" + # $MESON_OPTS is an env that can optionally be set in the container, # populated at build time from the Dockerfile. A typical use case would # be to pass options to trigger cross-compilation --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439849; cv=none; d=zohomail.com; s=zohoarc; b=RjKlVPzBUCfHfz4EbOKi9nQYU6eGOtssvYK63InKV3xv5wYolRYe5yMuiVaSP/954lyaIrd7uJiTdKB/SuQBiIqHmvLMzFGbfH6hAtyV8TvZC1zDh7i26oSSdDU8JHSAXjBxinvdkQxy8rhZ/pWmaEvrsoiTQYmhnH3mTGVqIck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439849; h=Content-Type:Content-Transfer-Encoding:Cc: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=ab1FyFhaW6JAgUF/nkCU+BSuMvki/vqN5xD0/GbP8jQ=; b=OFc78B6EEYGmLRORvnKUJhZ77ihqX9bjJRPIvIjaHmQyd3FQScHUHbzU/ew3He5b4jhwVFpMvJfYhqbSjJuKaBYpqCgHHadJQ421KkfVFzoZSq+3YEpR95NhmZ9JKLp6AT35uoM1MkrS/xJ76HabrLItpqBXMVVIl+1ILFuWtL8= 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 1694439849825999.4368894201934; Mon, 11 Sep 2023 06:44:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-370-n1S0_I1wM36ZeduEuMezRw-1; Mon, 11 Sep 2023 09:44:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB6423C1DC58; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D8EC2018631; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B205A1946A68; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 30A5919465BA for ; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 095F020110CA; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 465AD20111D7; Mon, 11 Sep 2023 13:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439848; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ab1FyFhaW6JAgUF/nkCU+BSuMvki/vqN5xD0/GbP8jQ=; b=dfIRofa83J63dUlE6VIVO0dk8hJNj0qC15qL9/RfLukoSZMdPlCORNEsS1cdYhYDKp8IMQ 3pbdwiZd5v6XbD60NrvF7qot8PX9OPkM2dbpYaas0eXPS+fJ+deV1PK8zkB/njbkz8xufe qRRs4yXUeUwYJSANv/f1/pKR7A9oEtE= X-MC-Unique: n1S0_I1wM36ZeduEuMezRw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/35] ci: build.sh: Don't mention that MESON_ARGS are available via CLI Date: Mon, 11 Sep 2023 15:43:04 +0200 Message-ID: <2dd86d9c86c68304cbaa712873ef0efb1c35a3f9.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1694439851804100001 Previous patches have removed the code that allowed injecting arbitrary meson arguments, same for ninja args. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/build.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 0549b01ca0..7cf07ba5a8 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -21,13 +21,7 @@ GIT_ROOT=3D"$(git rev-parse --show-toplevel)" # be to pass options to trigger cross-compilation # # $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's -# populated either from a GitLab's job configuration or from command line = as -# `$ helper build --meson-args=3D'-Dopt1 -Dopt2'` when run in a local -# containerized environment -# -# The contents of $MESON_ARGS (defined locally) should take precedence over -# those of $MESON_OPTS (defined when the container was built), so they're -# passed to meson after them +# populated from a GitLab's job configuration =20 meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439853; cv=none; d=zohomail.com; s=zohoarc; b=XDpspnSVNDZWc4E42dvAzVS+OMXLaLt0rLaqX55MvDCn3mnxjFWoDMDUAHxN8JAGB/m2DVayQNI3uuitFazUnHqWlL+PWgQRJEXRIhOWnDfHm74ne7EOHZYLWk7QkPuNhU+H8vHucqq9BWcR7kOIBFlLkHhwUuh2e3P6AekNCjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439853; h=Content-Type:Content-Transfer-Encoding:Cc: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=DpQ9wCUHO3M7Ymudn5oW9UEwyR88jkb1D/DZX7C8XFc=; b=muwcNOQB/5owRT6hU8EXwX/L+jgbf1bVBIin6riKlnc9/41BO3tQKgpd47939GQfrH6xGBvsd5PZpE80Q6EN15T2P5qdSVgPBeSbtpq3xN77y45qr28Ct0nS7HKPW1dDK5jLeu/Ft58AV+FRFd2Z0m7eClfF1zK9tP+1fOfPQng= 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 1694439853610884.3084159322746; Mon, 11 Sep 2023 06:44:13 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-30-kJshdnvCPhqd1MoyZuzhYQ-1; Mon, 11 Sep 2023 09:44:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97BEC28034D0; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C90840C6E70; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E69821946A75; Mon, 11 Sep 2023 13:43:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A4731946A4C for ; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C9B0420292A8; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47F562023466; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439852; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DpQ9wCUHO3M7Ymudn5oW9UEwyR88jkb1D/DZX7C8XFc=; b=hUEVXFPtjMyrl6aibfkUu8BEV87gZ8iFU1dI++tpuF4Has2PFqZ96nljB8KM+O3ZIdwKBR 4SGRmoRg9pNcKLQAdHtv3PeVfgA2100jfrE43OrMhbVWl9V2lSyTh7cRM9fE8H7gbQCPhV fhGHScZMaYqXj13PR8N/erDKOGagcNw= X-MC-Unique: kJshdnvCPhqd1MoyZuzhYQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 04/35] ci: build.sh: Add a wrapper function executing 'shell' commands Date: Mon, 11 Sep 2023 15:43:05 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439855787100003 Content-Type: text/plain; charset="utf-8"; x-default="true" This would normally be not needed at all, but the problem here is the Shell-in-YAML which GitLab interprets. It outputs every command that appears as a line in the 'script' segment in a color-coded fashion for easy identification of problems. Well, that useful feature is lost when there's indirection and one script calls into another in which case it would only output the respective script name which would make failure investigation harder. This simple helper tackles that by echoing the command to be run by any script/function with a color escape sequence so that we don't lose track of the *actual* shell commands being run as part of the GitLab job pipelines. An example of what the output then might look like: [RUN COMMAND]: 'meson compile -C build install-web' Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 7cf07ba5a8..5883542b45 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -27,3 +27,8 @@ meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $M= ESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 ninja -C build $NINJA_ARGS + +run_cmd() { + printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" + $@ +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439866; cv=none; d=zohomail.com; s=zohoarc; b=YFhPomuvtP08vJWrdsLJcHh5rLAAetTF5l2VPEzylbAH87RlXEcqDAoCZJXkmug1r+fsW7xKMuzkrFZcmPjTyh+ONr2yiy60ueUZhTIhD2jXmodRnQT2FQQwf8r9o7OiOWa9yuqynmO4HhOHQGvJa6GF/kjehSeq0qeegAj+LxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439866; h=Content-Type:Content-Transfer-Encoding:Cc: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=n3nOPZxmsMZ1OTwwuadBLhqzQGQ7K6nH81A1WOJkhWk=; b=ML/mt+UGQQKfLXzoMXZWcJYdzO+PMhdXTd1k5PradH5NzFEZU3WV80J4U+nVJzfIpkGeAEWHQPhb+36Jj27hzbm6QuDOORmEWk8cvAIzevF04zyY2/p4m5YyWL9p89n7a0s+WhZmZIT7SWi0JGN1GvqBUr9qUeNqx1x5gQIwdf8= 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 169443986621783.48489204129783; Mon, 11 Sep 2023 06:44:26 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-696-2koQD3yMP1maoY14P2GT8w-1; Mon, 11 Sep 2023 09:44:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3DB738F875A; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2739F40C6EBF; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 30B201946A73; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B34951946A69 for ; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9FC932022799; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 189552024CDB; Mon, 11 Sep 2023 13:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439865; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=n3nOPZxmsMZ1OTwwuadBLhqzQGQ7K6nH81A1WOJkhWk=; b=c03NdtAMOlFYpSWiXGGlHJO+ZE3uicr2H7phT5sNgeSgmpRg19Q8wbLcDk0aQ7HjIz4nYb 1nE9k+TNdSlrGqvzQfaTXtvHRbAnD1Qh39rRVlI8QsbhVYw0SEp5tuznMdovXrsDDt+fTn 8Ow3e04Bi6YEnJI0acMFR/lilFFKKeg= X-MC-Unique: 2koQD3yMP1maoY14P2GT8w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 05/35] ci: build.sh: Add a wrapper function over meson's setup Date: Mon, 11 Sep 2023 15:43:06 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439868093100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The reason for this wrapper is that all job functions introduced in future patches will refer to this one instead of open-coding the same 'meson setup' invocation N times. It also prevents 'setup' to be called multiple times as some future job functions might actually do just that in a transitive manner. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 5883542b45..477ccbc7d1 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -32,3 +32,8 @@ run_cmd() { printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" $@ } + +run_meson_setup() { + run_cmd meson setup build --error -Dsystem=3Dtrue $MESON_OPTS $MESON_A= RGS || \ + (cat "${GIT_ROOT}/build/meson-logs/meson-log.txt" && exit 1) +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439915; cv=none; d=zohomail.com; s=zohoarc; b=CFnf4Kx6B/D1DvRmnxdFd9V8i4kiKOuDklE0p1wJxa2RB/SPP5SlGYjUCxAczqpGCWuBnRqrLb7sAmANAyEVCyFqSsWmN5Wx6lU9R9rV3Vu0M3lchZdygQEsNPltCmWdQylly17zgCaUIe9LT9z1/h77gOrf7+HjpBBRx8s6RnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439915; h=Content-Type:Content-Transfer-Encoding:Cc: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=G7OLHbuvzFIYXVgjZVW+VZEb4IImkiLDRGSA7uoMlM8=; b=dZ7AXBrliwXXTdkwvknMQA2K7iJnsy21RGFWlb7U0DAMivFeojYeRn4Sl3lNnp0LENJjWG+r8hKsbSGc15QOU8w1L3ZrmRcfok519C9ckHRocyqGH024hJRX69O6tMVznu5sCJOFPhDHuJ9B8xQqWUr2LU+fnsArySOaNLsA+XQ= 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 1694439915259401.8231596934288; Mon, 11 Sep 2023 06:45:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-63-U6IxGOkDMxGB5e8xMFO2wA-1; Mon, 11 Sep 2023 09:44:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C3578AF79D; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2BE140C201F; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4FDC019459EC; Mon, 11 Sep 2023 13:43:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF2F61946597 for ; Mon, 11 Sep 2023 13:43:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7B4212024CAE; Mon, 11 Sep 2023 13:43:43 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3BEF2018290; Mon, 11 Sep 2023 13:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439914; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G7OLHbuvzFIYXVgjZVW+VZEb4IImkiLDRGSA7uoMlM8=; b=J9uHrBqSlpVmvWbgY8AhV0L+Kw/s/jbHwjGNrKjSCd8lbjqvfKyndb8EbFV47Sygf5hkJ7 pcKmS1wPgsS2T0+mB8vIZich/1HP7vjcnM8e0OLZdK769MTCxZgj/wdoMuU02xk0EOTPAt wxbr8tz2gRFd8MEny0Q1bE38YpP+xrg= X-MC-Unique: U6IxGOkDMxGB5e8xMFO2wA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 06/35] ci: build.sh: Add a wrapper function over the 'build' job Date: Mon, 11 Sep 2023 15:43:07 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439915640100009 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 477ccbc7d1..f908bbc5d4 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -37,3 +37,8 @@ run_meson_setup() { run_cmd meson setup build --error -Dsystem=3Dtrue $MESON_OPTS $MESON_A= RGS || \ (cat "${GIT_ROOT}/build/meson-logs/meson-log.txt" && exit 1) } + +run_build() { + test -d $GIT_ROOT/build/build.ninja || run_meson_setup + run_cmd meson compile -C build $BUILD_ARGS +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439966; cv=none; d=zohomail.com; s=zohoarc; b=IDoQtUS/qlBZ5IoG8GbkOncmcGW4kxTTR6++RZvMHvyTbodtUpwCfDwjBqPoYlG88bpLstEHW5/GhX+kkb9AqGal0KRMzTz9tMglpy8HpzK/UrGopCyEe0HxsqyvofSgWdzKw+bGYA51XjmZPYD2yGroFC2misK6WWjFGBLOWhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439966; h=Content-Type:Content-Transfer-Encoding:Cc: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=/uQY4srVIGaICUisAq1URJio04u5iUjdWMRfUdzbwKE=; b=NyI6BIWb1TQr147coDVhuKwP5sKrFCG6WXafT+4yF3iM4Szt7hBPlCh6UEWu1zolsZDdrTISJVu78j6rp22fqz8idLMHZi7ByAnr6j/NzFPiZvn0UvVZWRV8faIWiHbRuNuO+x9VoIe+Vp9d3DhgcrO+LcbMLA2gaLDx3tJpA3Y= 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 1694439966260513.3573499127609; Mon, 11 Sep 2023 06:46:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-KOEl7VNTObmPvbjjDIjWYA-1; Mon, 11 Sep 2023 09:44:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 600EC3C0C88D; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47B2040C6EBF; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 892521946A49; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5DE5319465B8 for ; Mon, 11 Sep 2023 13:43:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 40328200B682; Mon, 11 Sep 2023 13:43:44 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id B60EB202348A; Mon, 11 Sep 2023 13:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439964; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/uQY4srVIGaICUisAq1URJio04u5iUjdWMRfUdzbwKE=; b=OHFHkF3yhIglXta7qE40MyovrrGUxudPblUuLoV6fF8Ts1i/mz5aN/yxV3IKt4sumZ7Pjw Ft++84k/ASDJdlJoyTlOx0x1k4hlUWUJZ1+/M7pZM/IzR03UF5Vr8hn8+1cenHJ8HQC3El ueJlAfgMx9Fd4a4s3S3uuON2dPaJFhQ= X-MC-Unique: KOEl7VNTObmPvbjjDIjWYA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 07/35] ci: build.sh: Add a helper function to create the dist tarball Date: Mon, 11 Sep 2023 15:43:08 +0200 Message-ID: <2f6a0e36c68a075827653994c4f13941dd3e842c.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694440010475100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper function does not correspond to a particular GitLab job, it just logically separates the necessary step of creating a dist tarball from the RPM build job that takes over. One notable change here is the need to update git's file index which causes issues in local container executions which rely on a shallow copy of the libvirt repo created as: $ git clone --local Even if all changes have been committed, git often complained otherwise. Updating the index in a GitLab environment is a NOP. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index f908bbc5d4..ab56c5e5eb 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -42,3 +42,13 @@ run_build() { test -d $GIT_ROOT/build/build.ninja || run_meson_setup run_cmd meson compile -C build $BUILD_ARGS } + +run_dist() { + test -d $GIT_ROOT/build/build.ninja || run_meson_setup + + # dist is unhappy in local container environment complaining about + # uncommitted changes in the repo which is often not the case - refres= hing + # git's index solves the problem + git update-index --refresh + run_cmd meson dist -C build --no-tests +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439863; cv=none; d=zohomail.com; s=zohoarc; b=UdZikSS+6sviISjezi1438SD5p9dvOoepyoWtns46PfW0FHhI3VDlKdV4DpX7BRfuEtWjUJ6czqpLb6FO+lP6PoOOYj/8mI+Q2JtDY2eOjXJ6jDOGRe4RDToQGjvRxANg89M0CE0tQPAiJOXEAlv6PexTBCjz7nRMMrzsv783dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439863; h=Content-Type:Content-Transfer-Encoding:Cc: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=qiP1KGWS5j8elpDc+13d0FhN/baa2WwU3sFN+uOxjnM=; b=jrKU7TsEDgkboAs800jFfiL8lZ8Uo7CnqcGjvbydJi8EaXfXTgMZgKqrPuJYYttvI7nN7wnaLJH1S7h9q14fEkz8HSd5kd9eG8Zq4NnHnuyztNGvWf7jO6dSLL1YqDb4/5UCgYpCiOT2KUjcZasCR8KopaBqvkcQUbGKbRFt4QY= 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 1694439863173902.4808404798257; Mon, 11 Sep 2023 06:44:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-29-XCkxVwCEPQiAIHhWdKMRFg-1; Mon, 11 Sep 2023 09:44:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 792981C06912; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65E8C44069; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 729CC19451D7; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 232A719465B8 for ; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C6622022ECF; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80CAB20110CA; Mon, 11 Sep 2023 13:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qiP1KGWS5j8elpDc+13d0FhN/baa2WwU3sFN+uOxjnM=; b=V2ehdipo8JxnC702aGhvKzCJNLqMpUBUUYhn+SvMx1j8tSaQAlEtEnpz5h/vOFb90XK++U an/yase87TbOy8kjLX8/lkQyJcVB+Nckem8/e7Gy0bBf+y7qCGRJDXAlNJmOKjXPUJYgIc qyQxrc0Em5xOhzoEsXFjT6cQwAK1rOk= X-MC-Unique: XCkxVwCEPQiAIHhWdKMRFg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 08/35] ci: build.sh: Add a wrapper function over the 'test' job Date: Mon, 11 Sep 2023 15:43:09 +0200 Message-ID: <73491d8c9d8705eab8be00f4dce07334d6c136d8.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439864003100002 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index ab56c5e5eb..29b6a3306d 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -52,3 +52,8 @@ run_dist() { git update-index --refresh run_cmd meson dist -C build --no-tests } + +run_test() { + test -d $GIT_ROOT/build/build.ninja || run_meson_setup + run_cmd meson test -C build $TEST_ARGS +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439872; cv=none; d=zohomail.com; s=zohoarc; b=LSdnUpm6O6vqC+zHbG9FuoLADSR/SBMnv/eT+WhWtNYgxUeGT5LRamo2otyEAwv+RmNkrYn6vMFAj7QS9a7hWJGxjDRnf96WtbJzxnL3t9bSQnNyIcZS0EM+NX2u1uNTcSg2BM1FbP/BdLq6PEXoM1l9Qd5VWRNunqOw2ECP5aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439872; h=Content-Type:Content-Transfer-Encoding:Cc: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=b31I78/dAGS/0kUxfVdgvgTiw0BOwHoR9QPfwBcxyL8=; b=T6rEhJ5Q0bjK4gtz7Cf+H4amyBsrvrLFjgiHF99HK17wHjrEPbGBISoBjL0rujWZiU4MD29i7c8Adn8WtLCFEU7+eCdajUH8VULYscEVRcMU9w1o2DNJzFubseu2SM4IqadZN3uugszqRjhKhgpB/GBihRmROo35k8omFMEvd8s= 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 1694439872704512.8300837720296; Mon, 11 Sep 2023 06:44:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-225-ufHygJHKPCKD-xbXYrC6AA-1; Mon, 11 Sep 2023 09:44:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C2862999B24; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3657940C6EA8; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8450819465B5; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CB78919452D0 for ; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BFF16200B682; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45B1F2022EBB; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439871; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=b31I78/dAGS/0kUxfVdgvgTiw0BOwHoR9QPfwBcxyL8=; b=hzSfI6PBfTOKQA9xrw4OaWv3UAiXVE+vUCsPnHELGUC2xNrHvr6bBugTAk4IO56lfc6wRU Gmjy75wNAdpMJG3AZ0SHLS90A3+hpbDxiyoLIe7+J4sUaFMlnB0j82oH3NnJxCTfZxwa9w birrv68K9u9RKpsDWFiLqi5Mhbvq8dI= X-MC-Unique: ufHygJHKPCKD-xbXYrC6AA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/35] ci: build.sh: Add a wrapper function over the 'codestyle' job Date: Mon, 11 Sep 2023 15:43:10 +0200 Message-ID: <08b823f351c86b8aeef59375294cb5e6aa923b89.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439874336100006 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 29b6a3306d..e6c3225691 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -57,3 +57,11 @@ run_test() { test -d $GIT_ROOT/build/build.ninja || run_meson_setup run_cmd meson test -C build $TEST_ARGS } + +run_codestyle() { + BUILD_ARGS=3D"libvirt-pot-dep" + TEST_ARGS=3D"--suite syntax-check --no-rebuild --print-errorlogs" + + run_build + run_test +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439852; cv=none; d=zohomail.com; s=zohoarc; b=mQ39GY+Iy7KL//6tzE/4/568n60DtNMp1mvtVJ023lH8ntn8aK1n6W2a+0pgV/EUUFOdMhnVgqkQbeZ1z5R4zPgjfNFIyhrAXqjUOoP7TkCvOdL1JVZebLSJxhyEqPKGw2IXlY5ipezGUmHyF7baOtyz6FDhbF9mHipB8SbsQz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439852; h=Content-Type:Content-Transfer-Encoding:Cc: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=biiqwu/d3RbiYJg01lj0Tb2PDI5Fui/jOHABVn5AY14=; b=Lx6JvxLffLGEzq7RaCYj56dHJGoEsOl6OPppVxW2au1+yx+WuwjBQbolG1fUVIyniRi1rh+LnpIenYxca2VvwmaT6zI2Bx5I1iAsVGXkE8LeJX9YUzHmCFvJ7F4p78UuLzJmEPDbQ+VKTh7OgHowEx06hB8FbD1EkqGhhfBLI/Q= 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 1694439852856395.6823118820955; Mon, 11 Sep 2023 06:44:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-G25Q9k_qMiGBZjXEn1KuVw-1; Mon, 11 Sep 2023 09:44:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EA666182E7E3; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D17222156701; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF6A91946A52; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A34BD1946A52 for ; Mon, 11 Sep 2023 13:43:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 84C282018111; Mon, 11 Sep 2023 13:43:46 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09AB320111D6; Mon, 11 Sep 2023 13:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439851; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=biiqwu/d3RbiYJg01lj0Tb2PDI5Fui/jOHABVn5AY14=; b=L6g8sbQRwckwI+MozSnHXbMip6HfKnRoVRFt4BtXx/9LU+E0I+Ey0iQTHgRNBSCnOLyfJU TTRDfQkIkAXHLfSRD5rUv6zhZnljFInUQtnGEP50ufXljp2dsjygvQVUmZZQMpOinxvG0h i60V39+5DVExKx+aPXQNn8I5rB4JkI0= X-MC-Unique: G25Q9k_qMiGBZjXEn1KuVw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 10/35] ci: build.sh: Add a wrapper function over the 'potfile' job Date: Mon, 11 Sep 2023 15:43:11 +0200 Message-ID: <23a15b0dfa936775e8ba8f5c56a47d16ba1fd1ed.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439853986100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. There's one notable difference such that we pass '-j1' to the meson compile command otherwise we'd have to execute the 'run_build' function twice, passing 'libvirt-pot-dep' and 'libvirt-pot' targets in a serial manner. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index e6c3225691..d6361f3ade 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -65,3 +65,14 @@ run_codestyle() { run_build run_test } + +run_potfile() { + # since meson would run jobs for each of the following target in paral= lel, + # we'd have dependency issues such that one target might depend on a + # generated file which hasn't been generated yet by the other target, = hence + # we limit potfile job to a single build job (luckily potfile build has + # negligible performance impact) + BUILD_ARGS=3D"-j1 libvirt-pot-dep libvirt-pot" + + run_build +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439861; cv=none; d=zohomail.com; s=zohoarc; b=XUpwYj5HV5KErTnBDSV91TiaQauWNw1AaKbuSs91gS3quYuBh/AGRdQvqBingtQr7OfkB4NwqXtKf4X2oPMS6Ay6Z/Ww7IeD/Rj/1Foxe40rDRsdbMR17ftNPE8ZOiTbc7mAbgmrMmhD7qzD9cWSr26tKIVOcGlLsJYyAr0zCFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439861; h=Content-Type:Content-Transfer-Encoding:Cc: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=ani78aec5JkoGNcpECKheYI5Wle+kxffgpm63AorG+s=; b=OhlrrwjwVKLcbz5pllRRD7IweRIpheev8omBQ3ocs/4oYWmSEJ3zADtLLBJcDvquE1zd2cmt5QnB7lb+6J0mqIZGcYTeK02u9oRwJcsnn5RgnHQ/YK9IexHC4iVvuY61W1CJQs5NP/p3dhh26SPhWfDxqhaZQ14mavmDZvAh4Co= 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 1694439861709295.123105176659; Mon, 11 Sep 2023 06:44:21 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-E4YktEefPdWEmfXswNmAzw-1; Mon, 11 Sep 2023 09:44:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D3EB3C0F67A; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 179E640C6EA8; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 030DE19465B6; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 507331946A52 for ; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4910A2018626; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFE09200A2F4; Mon, 11 Sep 2023 13:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439860; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ani78aec5JkoGNcpECKheYI5Wle+kxffgpm63AorG+s=; b=CBlW12EXU7jwfUtPE9/AziXP/SA8JhAPvwCqMJadxnNn9EsL3AU7ZBONVxJgWH0/GpGYcn 4BJzDnTeQpZKBr3hAljoteHg3DM/1mnMrK0Llu/FsN6Rv4XFlTQyXLlQKFgOb3IFpv1XO+ LxQO+xYhHUh9/gRf992Zv/h7GSp25Ao= X-MC-Unique: E4YktEefPdWEmfXswNmAzw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 11/35] ci: build.sh: Add a wrapper function over the 'rpmbuild' job Date: Mon, 11 Sep 2023 15:43:12 +0200 Message-ID: <4fc6c4a99f9df4cba73ee46b25f347b013decbf6.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439863996100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index d6361f3ade..c558b4c9ca 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -76,3 +76,12 @@ run_potfile() { =20 run_build } + +run_rpmbuild() { + run_dist + run_cmd rpmbuild \ + --clean \ + --nodeps \ + --define '_without_mingw 1' \ + -ta build/meson-dist/libvirt-*.tar.xz +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439868; cv=none; d=zohomail.com; s=zohoarc; b=DMDxdlyxUdJR1iBDzhp+MO1NZLsnZ2YJfqdaosaDOSFHo++bG58nJaSc4KaldaqWKXxBbsplW4vs+VhDYcSpK6Tusq4fwmdPDkdk2995n9dSQMOtYe77Aqfd47Tiby85ywvPonFhI8LW+MVjkrbXNjTMYRHEM3l/aq0+Tyt6JTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439868; h=Content-Type:Content-Transfer-Encoding:Cc: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=HxOGm73dnqsgGoFFp6z8keHNo64tZzNu37CpthrFa4g=; b=TZU9dTHq2kdjnepsbc1SPIb+hgrTKpozHOo0zMM7RTLvxgJ2Xl6JPK/Nw2zinQr1qGkv+snpJXiRQsZGcFc/E+RPiWWydjzuGHjDlBXAy7UwZ1qs4qXQRbG8X5SB8njcUaZB3BgzTemJ8hb+0sJqRm8uDa1XKX5Vw829yDpRqg8= 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 1694439868164459.6749836975414; Mon, 11 Sep 2023 06:44:28 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-207-iFxcRNtPP8iVoyS_6uXfZQ-1; Mon, 11 Sep 2023 09:44:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7AD728C9CD4; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6306421B2413; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 59F251946A45; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 12B3919452D1 for ; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C196201E6BC; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 845352022C35; Mon, 11 Sep 2023 13:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439867; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HxOGm73dnqsgGoFFp6z8keHNo64tZzNu37CpthrFa4g=; b=PKZvB8t/ImElTUHIh/MQe1MkGnOKSY07W2O17nOdzmlDG6RV24sgoVVSdeONr0av+139Iz mWUHCIIXfckDeRDGqz4T8td9cxCOQonscMCjOKxeovr1L7B1S5yEqjSFLd0CH5rNj510Wr H0PoNI0vO+5o4BcjqaWVay5/7KTZ9A8= X-MC-Unique: iFxcRNtPP8iVoyS_6uXfZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 12/35] ci: build.sh: Add a wrapper function over the 'website' job Date: Mon, 11 Sep 2023 15:43:13 +0200 Message-ID: <7bd676ed50eceee3972d53cfc002b3fcec1a1dab.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439868990100003 Content-Type: text/plain; charset="utf-8"; x-default="true" This helper is a shell function transcript of its original GitLab CI counterpart. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index c558b4c9ca..8e1619d483 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -85,3 +85,10 @@ run_rpmbuild() { --define '_without_mingw 1' \ -ta build/meson-dist/libvirt-*.tar.xz } + +run_website_build() { + export DESTDIR=3D"${GIT_ROOT}/install" + BUILD_ARGS=3D"install-web" + + run_build +} --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439915; cv=none; d=zohomail.com; s=zohoarc; b=nl1qncHRuFhixCu9GfVzOEeNOB1myRTqpuT7qg8qkxZKLbDwp6Xx8zPaE6UTCia95zri8oTpVjyf4WvVTY7Ez8m2pb8itnwlEcozlFhZ97Fz+diZqfKwLaL20AL6RTAXySFSV1obfh7JeoX8Bwf7Zrqlgc62IbEyKR9DOgFno5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439915; h=Content-Type:Content-Transfer-Encoding:Cc: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=Y/FjKM0uOTGTitnbLyaHQjfc9wfKtmcngGnWsoBPTBE=; b=MsaRIAICAeNMoI6oyvUndryk6+BVIlfkN94lsQd8G6eBdZE3W374mkkSqbIUuSb9DBQzHcOIKlyAwZ/OmSWM/Pw3PK/szggU9ZAXFALn8Ib49EbJwNKtOc4cFpS6JYYs0bVZshQHWgFqxfDTZ2cG65gw7a6/hySzo8fVHZfkRsk= 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 1694439915352369.7142121361413; Mon, 11 Sep 2023 06:45:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-398-xtX7-TufN3S5dFcUC-vBuw-1; Mon, 11 Sep 2023 09:44:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A73C927A90; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45D8C2024CAE; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BC2BE1946A62; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CD85819465B3 for ; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C79942023163; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4800420113EB; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439914; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Y/FjKM0uOTGTitnbLyaHQjfc9wfKtmcngGnWsoBPTBE=; b=FV5JGYRoR1vWnZM5+LaVKEF2zwgxIX6kPjRVP+iVfVffydLUFUv58SEBmheFID0uSgJttj 9HuqMFRleq1okl90tY3EHEEFSs8cRnQEmSBZ05+Hm+Lfp4NZIu58y45vT60hfGqpgdGRxj V9z3fdBp225Xrfnpd2VV0hr26Oh/YP4= X-MC-Unique: xtX7-TufN3S5dFcUC-vBuw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/35] ci: build.sh: Drop changing working directory to CI_CONT_DIR Date: Mon, 11 Sep 2023 15:43:14 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439917657100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Firstly, this would mangle with "sourcing" this file in either execution environment later down the road. Secondly, we won't need this as future ci/helper patches will generate a throwaway script that will take care of a correct execution of a build job in a similar fashion as if the job ran in a GitLab environment. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 8e1619d483..fd326dad8d 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,7 +1,5 @@ #!/bin/sh =20 -cd "$CI_CONT_SRCDIR" - export CCACHE_BASEDIR=3D"$(pwd)" export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" export CCACHE_MAXSIZE=3D"500M" --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439871; cv=none; d=zohomail.com; s=zohoarc; b=DQu1LgXK75WVHJHRfuGZGQQdis3U0FuAstaQW/7Frlnnbl4XxCtQbKf+cZZ0I6f/6Xshocdf7D1WtQ/bjgJ2nb+oLaHYJLOLlkALQD2x576wd93jn0gvsGvK9ZuM9CIGzb5dx/ldAKzLAkptqFLJ6wdN8JZslFtIlGUxnilvN94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439871; h=Content-Type:Content-Transfer-Encoding:Cc: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=noptQ3WlShIvgXxUo9K9QgvXQ8TzKvfjI9AT0FYf1JM=; b=oEqY0+7PFpIMIFSlJJhx+gp1zhpNosYOgmXyPzdVMeFkv96GT+obp8f+B08Ow0G9ZIS9GGYLr4vIW1hgD8L1CgRM0AZ7D2H0pvwhVdPcMN/Uwqjxx1K8etnjCxKuXUJWbUT0LdP8KA0IRDio4dok/v9kQRMZbhaSlIYSfBko55U= 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 1694439871585983.4476566494907; Mon, 11 Sep 2023 06:44:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-CATmXidIPtil4NB-m-w5KQ-1; Mon, 11 Sep 2023 09:44:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23D04182604C; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C4B320268C8; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 129F619451CD; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9105F19452D3 for ; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8C98F200AFA7; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10C33201B070; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439870; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=noptQ3WlShIvgXxUo9K9QgvXQ8TzKvfjI9AT0FYf1JM=; b=Funotuux//O+pbZFNjuMcTrWT/TwnyfmoeJHt+Tc3uKaHsiWdBpqJIev7cKkoo1xzPybY8 eNRxpFUOubT/RFFjDdYM76g18UXHiT0HHC8A8d8ehcA5vqYJzQPyYOkmUQGsssUnGajbah +7Ji2wAAToV/SQK4K1eqRpHpXpDc3oQ= X-MC-Unique: CATmXidIPtil4NB-m-w5KQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 14/35] ci: build.sh: Drop direct invocation of meson/ninja commands Date: Mon, 11 Sep 2023 15:43:15 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439872204100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We've moved all invocations to the respective helper function which we'll execute both from gitlab CI jobs and local environments so we don't need to have them on the global level as it would also not work with "sourcing" this file to populate the environment with function definitions. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index fd326dad8d..ac649ed9a9 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -21,10 +21,7 @@ GIT_ROOT=3D"$(git rev-parse --show-toplevel)" # $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's # populated from a GitLab's job configuration =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ -(cat build/meson-logs/meson-log.txt && exit 1) - -ninja -C build $NINJA_ARGS +MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" =20 run_cmd() { printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" --=20 2.41.0 From nobody Sat May 11 11:43:29 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; 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=1694440024; cv=none; d=zohomail.com; s=zohoarc; b=j2Oo9dcxaHzDyVmfqGuZOwh9E36m+yivWnO4Yjjjtx6fBGpkrvfeGS9s65461k/d/BlBqDIgexEZjXeY4gb+OddzFN+Y3YYxlEMa9Wk1giQUyoXogXJ1Jh8C98yE6/RSoOSpPgRoEFyN2Qa94Kxc9bNIQQQq7HWMCwyfd8tKJvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694440024; h=Content-Type:Content-Transfer-Encoding:Cc: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=zg5/AyyocvQFgv1heH3OY8i075Yv/jzS4+kIjLikY4o=; b=akGCOCbxDW/bV5c86Dxp+gj3GmACNbaza4uADkIUAvMZ9WrzDwnhL96Z7m+Q+tW4aZ7SL6uFa2wIE5SiSGYxEmaDfAfCrRofebPadqEBnBc3Dn4kQoNGq38Mf7ZYZ6kHrFZif95QLt9zf+8snfOBpxI0J7eSBaJBLo92KVsrgM8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1694440024106992.328581668821; Mon, 11 Sep 2023 06:47:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-295-Sqjv61FMOEaiol6k31ePPQ-1; Mon, 11 Sep 2023 09:44:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48C222A59573; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 288C32156721; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B964019451EF; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 995F61946A51 for ; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6BF9F2024CD6; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id C670D20235BE; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) X-MC-Unique: Sqjv61FMOEaiol6k31ePPQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 15/35] ci: build.sh: Drop MESON_ARGS definition from global level Date: Mon, 11 Sep 2023 15:43:16 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1694440065143100001 Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/build.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index ac649ed9a9..96ee289c4f 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -13,16 +13,6 @@ if ! [ -t 1 ]; then fi =20 GIT_ROOT=3D"$(git rev-parse --show-toplevel)" - -# $MESON_OPTS is an env that can optionally be set in the container, -# populated at build time from the Dockerfile. A typical use case would -# be to pass options to trigger cross-compilation -# -# $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's -# populated from a GitLab's job configuration - -MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" - run_cmd() { printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" $@ --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439858; cv=none; d=zohomail.com; s=zohoarc; b=MinhnOWVICq9euOu4qoDhhyOTx8Sa5XO2O005wmFntf815Hv++HtvpuUQWPxzYSLwflX9R/iwjIfFo0Jj5iWcRSq1tBaPcPkmnsauhrLrPzclbKoSfh/aPR0r1O8apEeKnmZHpqOnRHB7uAnDd5KN565kdHxQxDu5SVJera9CkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439858; h=Content-Type:Content-Transfer-Encoding:Cc: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=EBY/wDMhtq7CZjg1UjGeD1Tk9NrvYMysxLFWBC39wBY=; b=Z6ucZOYyRt4vg9cpQUYL2hwphsOlA4dYpSNbvTUy9YOtf9180/QbFYlg568YpjYenToCoOhnoejP5JTtL+jKz1tIQ+cNB1KC6WQkVDMNkA5WoiE/T1P8RLv5sM2CChVitPKBGrVsXEzyW+y5yy2o7scQD+e6AxF4l5zq4Xg5teM= 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 1694439858383865.2703782282912; Mon, 11 Sep 2023 06:44:18 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-tiIUN76EPGabYKxuYMQVvQ-1; Mon, 11 Sep 2023 09:44:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99F571C04348; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 841C140C6EA8; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 90ECA1946A51; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B3501946A47 for ; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2CA842022EBB; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id A575F2024CAE; Mon, 11 Sep 2023 13:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439857; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EBY/wDMhtq7CZjg1UjGeD1Tk9NrvYMysxLFWBC39wBY=; b=S3GIQaOrmWawTqOxveIweFBdlrJpYUeR3hJNOPQTwMeFaGYj+nJRI/SYj30fuSCRgcd/5s UmCmALxMcSwJwyv+U3u7pCYQ5EM2AAeaq+M5efVnpbkl8Z8wiY0sC32Wg54ZmtzEea6PzB 7Y8hQyOg/tXQa8MYhmVEUccjW7PnWVg= X-MC-Unique: tiIUN76EPGabYKxuYMQVvQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 16/35] ci: Rename build.sh -> jobs.sh Date: Mon, 11 Sep 2023 15:43:17 +0200 Message-ID: <984d084bc84a71aa8753e86daed819297e0a77c6.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694439860009100001 Content-Type: text/plain; charset="utf-8"; x-default="true" After the recent changes, this script no longer executes any logic anymore, it merely defines the jobs run in the GitLab environment. In order to use it, one has to source the file in the environment and then run one of the job "functions". For that, the 'build.sh' name is no longer descriptive enough and 'jobs.sh' feels more suitable and less misleading. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/{build.sh =3D> jobs.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ci/{build.sh =3D> jobs.sh} (100%) diff --git a/ci/build.sh b/ci/jobs.sh similarity index 100% rename from ci/build.sh rename to ci/jobs.sh --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439914; cv=none; d=zohomail.com; s=zohoarc; b=e97TelTZGJpsnQ6yuhivmy/ohjg2t2zIk/NxDoz4G4EU8l0rmFnmgEbEBQm2J6Q/cxiNKYckx+sqXKB748ZjeHENcX66hYPJO68/x6IW1X8ZXI5q6x0jh8Im7S77dtIEvXj1hcbevHeIsAJd7jQO1fUc3A5cIzx7DdgSnT1zRAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439914; h=Content-Type:Content-Transfer-Encoding:Cc: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=pj3AB2BBFeKRM/1pycIFMfJbcCfT/wtw1gh00z+w10k=; b=MSZgsUVXNUBIUIpvssatrk+T1WBzNLIxp0lgFG7E76wEewTOly9ZNKJ6kzxL8Sf0XY9jAELnx4JwlqxBgrBoELvNhOY4VnSuv62Utq5uhOGmon67agios35vBt5Nia9wm4vG8HVaKuoCQyJiNx7aD03u5+B5NmazSjFy2Vt2/pk= 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 1694439914495105.70470738017343; Mon, 11 Sep 2023 06:45:14 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-466-mhdmxpeDO9WvmBcAHCxreg-1; Mon, 11 Sep 2023 09:44:29 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2B6051046322; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 151A740C2064; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D15D19451D0; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 29A541946A4C for ; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0A91F2027045; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6742F20268C8; Mon, 11 Sep 2023 13:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439913; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pj3AB2BBFeKRM/1pycIFMfJbcCfT/wtw1gh00z+w10k=; b=dLSFGzHG7oAHnnnVrua/atDFGZidOgdfPsXoIceg7k499ubbeiVfnMMWlV2Fq3kiJrj2Mp h3TOGo7NqoZ6e1OhpZCNKck5fIF/AiYJoxZchAUvF28jsh52xkHmu2OZGDHffB2nXrm0v7 MIoYLJZBbdOSmVH9jg2EBxKpIzZw0e4= X-MC-Unique: mhdmxpeDO9WvmBcAHCxreg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 17/35] .gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection Date: Mon, 11 Sep 2023 15:43:18 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694439915552100007 This is one of the preparation steps that if not done would otherwise collide with local container executions where we: 1) don't collect artifacts 2) are not limited by GitLab's environment and hence moving build artifacts to unusual places would only cause confusion when doing local build inspection in an interactive container shell session Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 944a7b7817..1c6af8f8b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,11 +31,16 @@ include: - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/me= son-dist/libvirt-*.tar.xz; - mv "$HOME"/rpmbuild/RPMS/x86_64/ libvirt-rpms/; else meson compile -C build; meson test -C build --no-suite syntax-check --print-errorlogs; fi + after_script: + - test "$CI_JOB_STATUS" !=3D "success" && exit 1; + - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; + then + mv "$HOME"/rpmbuild/RPMS/x86_64/ libvirt-rpms/; + fi =20 .native_build_job_prebuilt_env: extends: @@ -77,6 +82,8 @@ include: - *script_variables - meson setup build --werror -Dsystem=3Dtrue || (cat build/meson-logs/= meson-log.txt && exit 1) - DESTDIR=3D$(pwd)/install meson compile -C build install-web + after_script: + - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - mv install/usr/share/doc/libvirt/html/ website artifacts: expose_as: 'Website' @@ -155,6 +162,8 @@ potfile: - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - meson compile -C build libvirt-pot-dep - meson compile -C build libvirt-pot + after_script: + - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile' --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439873; cv=none; d=zohomail.com; s=zohoarc; b=ceUJUHW+ekdrtnYYML2Eqc2SkM2AI+4Cep0uwhcc8yCxGBborxWQNFvAC+2wYsTKxyCoOxVZkZnBmotlEP6/hjLTJgY7FLA28qQwNxK+IFmqrbKZxZYhbrzulbfmLLB4+A2GEjueqVHFYQMdPVwCiYumyiMXe9i1jSnuS3K2LOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439873; h=Content-Type:Content-Transfer-Encoding:Cc: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=CQPzmZwtrPf7H6ZK4rLNOt8VnmkZSAEhdFqAjSJb3Sw=; b=ZBF5AIgPlBtG0WXdVnjILe/RR3ySJfgR9EL0x1R4IknylCULP5aRvWY7Sdpgk9uRHR8uar7j6bLHZ1W/68XkYEwW8DMd4lLROS17F94l1QFWKlePiapL0rbpYArpEYF+3av/zVtKqA61qc/yDbfewkvRqKJYCq5b1pRvZDGCBdY= 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 1694439873970993.7986100786984; Mon, 11 Sep 2023 06:44:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-16-VrVYyvI9MEeKXdWutpZdQA-1; Mon, 11 Sep 2023 09:44:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF2A5927AB0; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4E444404C; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 064D019451FD; Mon, 11 Sep 2023 13:43:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB7201946A4F for ; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC7592027046; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44CF02023499; Mon, 11 Sep 2023 13:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439873; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CQPzmZwtrPf7H6ZK4rLNOt8VnmkZSAEhdFqAjSJb3Sw=; b=CeQffciX54SMcEy5HZ+oBvXjUQhkW9CHJFatjskjqT83I892BKJksX+Sr7d1lA+eAhiqXr dnTl9MxVjtusPVMIgsCy89jBSpVmSj4y+SY42XCVATFjsqIIOnLCzx92f6iiELNm8G/yOc 52hWk2onybj+ILhmxaZ9k9Qu8FR6dGE= X-MC-Unique: VrVYyvI9MEeKXdWutpZdQA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 18/35] .gitlab-ci.yml: Convert the native build job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:19 +0200 Message-ID: <2848bf5e8aecf2a6d90c1f1483b7da9d41c85abf.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1694439875168100011 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c6af8f8b3..c837812091 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,15 +25,13 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meso= n-log.txt && exit 1) - - meson dist -C build --no-tests + - source ci/jobs.sh - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then - rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/me= son-dist/libvirt-*.tar.xz; + run_rpmbuild; else - meson compile -C build; - meson test -C build --no-suite syntax-check --print-errorlogs; + run_build; + run_test; fi after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439906; cv=none; d=zohomail.com; s=zohoarc; b=UO23OPG7KPDaY6L+H3f5qgtWdbdy7+ppM2tyzfwcSWwQr4EHyi8aFWX7fsb+kLTvCVbtOIshNoeVNzG93cw0YO4NP5pPsBYyOOXL2Y58JQk/+6HmS/Q0yODrehwV6Cu6xtL4MzG+DfmYUv6H3X055YvTx5kQwl5iXLUURZaMvs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439906; h=Content-Type:Content-Transfer-Encoding:Cc: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=0BAOdT4kr7z3Wge0txcZEw2QJXjeQiwvuNHAXZljp6A=; b=a4TleZZyNZpja3bJx6av7/vA6jiRudaOoLacmH0ZXwPPtKFzW5yGSManaoIvcTIe1F+Oq23TIqXZ0/o4IKPlbJa/rjOeIW7WeJXGAkXNdQ84yQ1HEMzdXQNzLVTQBH/uZjdlkjOv54K/TQKxSRgpQJKvQstX1VRjXkVMdH7wbgs= 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 1694439906608645.9407022282483; Mon, 11 Sep 2023 06:45:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-510-enHCfDAcOuigraH80GKouw-1; Mon, 11 Sep 2023 09:44:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 83E4A8F8754; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DC7E2156701; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C699F1946A69; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D0CD819465B3 for ; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C14292027047; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 284992026D4B; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439905; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0BAOdT4kr7z3Wge0txcZEw2QJXjeQiwvuNHAXZljp6A=; b=AfOzy43xTOR4NgMwuWSdlCKsjBAhnSSznSLjhZ7LgcOl8FUVblDfm7AxvylQYxuLl+TBy5 +d2yBXa96b+AHRSaEMA24VaFKC7VbyNdEUX1CDJDqkeUUnklR4mHleCWZJltstoDSnOCyo d+ateJraG6MX8CboqcbkljQjP3MAzzs= X-MC-Unique: enHCfDAcOuigraH80GKouw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 19/35] .gitlab-ci.yml: Convert the cross build job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:20 +0200 Message-ID: <3e4b471bd1ffbbb60dea3a3a3019e35e741a8476.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1694439907423100005 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c837812091..f4c5b47f15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,10 +56,12 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - - meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meso= n-log.txt && exit 1) - - meson compile -C build - - if test "$CROSS" =3D "i686" ; then meson test -C build --no-suite sy= ntax-check --print-errorlogs ; fi + - source ci/jobs.sh + - run_build + - if test "$CROSS" =3D "i686" ; + then + run_test; + fi =20 .cross_build_job_prebuilt_env: extends: --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439904; cv=none; d=zohomail.com; s=zohoarc; b=buhU09QmWPa5UqwIXNqL63xID1HSVtLGVCl8yjmgvvtkveYDw7e9zaOrHbXx/sMnFYsmTtDMli6lo7QZRnw/34qjRIdQTu3SJl+5ac2IrJHpncIGjzp0meFX5qjRZ8eGPdT1osjo+NooqfCFGxNrvg2EfeQADPVRv/TsYKHCcsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439904; h=Content-Type:Content-Transfer-Encoding:Cc: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=UV4y35v/O0wjlLRAwb1lgAEC5/LFMeivarmcJ2PSr5Q=; b=bjmufBdePg3gKZ+RxtLprIuAgq1qkYC+ZUJZKZzecVNxlfptb/guJ0VP2paonMulk7rggNMmbdZ+Dp304W0ARYaOovSsLewvWASq0UbSepZGQrnTrC6/vmeI6HO+t0SbMBNa0EjofM0XpVzLH2fWyhIENpxfClt6potI6XtnsV0= 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 1694439904333565.9034204908371; Mon, 11 Sep 2023 06:45:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-455-VEmCX3fBNhmHMQts6O35Qg-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C8502A59544; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85B414404C; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4929319465B5; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF4CA1946A76 for ; Mon, 11 Sep 2023 13:43:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9F04F2026608; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06BA32027045; Mon, 11 Sep 2023 13:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439903; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UV4y35v/O0wjlLRAwb1lgAEC5/LFMeivarmcJ2PSr5Q=; b=BdrjRGiGj/+56fuYr9owhLPJ2gDTes46JObdfxLJfMWD+7w1hdke/vxUosMlRzT8Bv1XZc ixo83cFfhcUkESkAia6IQ3NuLT1yd3VZCok4S2lcQLVW86vz6rT07skEncr3EH0XFEIQSB e2oidS7h8y475RaQSX7zryFJwDfKMfw= X-MC-Unique: VEmCX3fBNhmHMQts6O35Qg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 20/35] .gitlab-ci.yml: Convert the website build job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:21 +0200 Message-ID: <22da2ada9f0764f9249ea08d396e9d434f7246b3.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1694439905853100001 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4c5b47f15..d41cc63ec2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,9 +79,8 @@ include: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite .website_job: script: - - *script_variables - - meson setup build --werror -Dsystem=3Dtrue || (cat build/meson-logs/= meson-log.txt && exit 1) - - DESTDIR=3D$(pwd)/install meson compile -C build install-web + - source ci/jobs.sh + - run_website_build after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - mv install/usr/share/doc/libvirt/html/ website --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439872; cv=none; d=zohomail.com; s=zohoarc; b=Mc831qAVJX18aAo6+LRul5AsCL6XbzKByeykAH1UAy40L6+CPWjBawmQZ5ihzgi0JYBVbbsw94fMcZUAVXNLKdcARB/ya9NKX0HZ4adF3TbBya6BbZ8g9MhiSMF4ZnOBfCHGNAmW6WRK1Bhss+QcCXF+qkuRRLTLzx/iUj67avk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439872; h=Content-Type:Content-Transfer-Encoding:Cc: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=fyggVrS/DfX3Y8pLduSG6lIPBbuSlYW/FhqZ6ZFwnMA=; b=cdgggFsdO09FOn20HjNegFhGc+74ncf1ucqZwwwhqOCKkLZgCnn+B2ur9ofiaCeHl7iJfIr6gW04r9AcrTLqkLMjdxvJPxkv5bXv3llhqVJwJ4jtcLUwqbS7QR3jCfEIy0S6dHdIMEclbXayChdxWCrj0WdG+T+iAWSB3VqZrQQ= 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 1694439872145648.1754767136924; Mon, 11 Sep 2023 06:44:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-yUcp7--zNEqgL8dwk_QOdQ-1; Mon, 11 Sep 2023 09:44:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 53FA38AF7BB; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A14140C200B; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7E6F0194974A; Mon, 11 Sep 2023 13:43:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8604B19451E5 for ; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7FEAD2027046; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAEEE2026D4B; Mon, 11 Sep 2023 13:43:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439871; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fyggVrS/DfX3Y8pLduSG6lIPBbuSlYW/FhqZ6ZFwnMA=; b=IahR0tWiY3VlCjA7hqA5Z2tdBdRxj4GOmYr9JF66Z8U9dmGTKYPtif9ZgKJdnrQhZBWgFg +KRPxnr+neLCLDN9dhe/JaDkHaCt0qgtsIou6Nt6ZG5gF/Tt7KBECGS4gs3STVfEwNdfDb p5jfgMKed3ZjMWSFB6VmtrS9Mw5n+Bw= X-MC-Unique: yUcp7--zNEqgL8dwk_QOdQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 21/35] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:22 +0200 Message-ID: <6cf38b8df57eca38fe9faf3651abd4a4cfc22aa9.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694439874220100003 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d41cc63ec2..35f1a1e135 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,10 +114,8 @@ website_local_env: .codestyle_job: stage: sanity_checks script: - - *script_variables - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - meson compile -C build libvirt-pot-dep - - meson test -C build --suite syntax-check --no-rebuild --print-errorl= ogs + - source ci/jobs.sh + - run_codestyle =20 codestyle_prebuilt_env: extends: --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694440030; cv=none; d=zohomail.com; s=zohoarc; b=YsMiPzJTKO0nveQCZa+cFM9RVyggExPNhb38IR2jmbPhv6XVN3XYJRP9vo9/PCYS6SvS0PUHLK14Q0QRMhy0zBGk4zJ7Q1Yxfi6Jl6sfGLkB9yOqhjuP8N+kplL/xhTbA42GX3GQ2sgwlVk3+YcophkObonmA6kwT4P78te7j3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694440030; h=Content-Type:Content-Transfer-Encoding:Cc: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=enQGHymLLpcTnvUxPcaEh/9AdH62oSiX5VjVS3Ol94E=; b=CI+QuLbYz9WhfcnfntROjMtApqq58GJWmNCIV8VdasNDr06RAw/+HL/DKQjgzZpdzN0XjqweYgEDngXXa226vti26cmHQ5J/IRpYgeJ8Cbh2RDcLS2vzr6Kr6rXJSi8O7ghqT0xXfStvUnGugaDj5GyhHS4qkVw6FYPWSa5m/eM= 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 1694440030114635.9878063117023; Mon, 11 Sep 2023 06:47:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-lPHOG8tQPWGjTPQ0pz1wNQ-1; Mon, 11 Sep 2023 09:44:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B98168C9CDB; Mon, 11 Sep 2023 13:44:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A525F40C6EBF; Mon, 11 Sep 2023 13:44:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5206B194973C; Mon, 11 Sep 2023 13:43:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9949819452C7 for ; Mon, 11 Sep 2023 13:43:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9477F2024CDB; Mon, 11 Sep 2023 13:43:56 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA45F2024CD6; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694440029; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=enQGHymLLpcTnvUxPcaEh/9AdH62oSiX5VjVS3Ol94E=; b=IPZf5hENyFUms93dpcpr68a5umMDXmPbH499+WNw2h5/XPsW5ALTuHQ3P4n+ZA7GP4Vv52 ChySjjsJoqUwaXKccHLs/efytk+5d0PdIqEWTxcOksL1vNSWsxXj/kPP7/yY8Vu5spGoGL +Hx4TUa2AoUOU6dr8M7iX2Lq7HMwiLo= X-MC-Unique: lPHOG8tQPWGjTPQ0pz1wNQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 22/35] .gitlab-ci.yml: Convert the potfile job to the build.sh usage Date: Mon, 11 Sep 2023 15:43:23 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1694440077729100001 Individual shell command executions are replaced by respective functions in the ci/build.sh base script. This will make sure we use the same recipes in GitLab jobs as well as in local executions. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35f1a1e135..1cdabed941 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,9 +156,8 @@ potfile: before_script: - *script_variables script: - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - meson compile -C build libvirt-pot-dep - - meson compile -C build libvirt-pot + - source ci/jobs.sh + - run_potfile after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - cp po/libvirt.pot libvirt.pot --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439873; cv=none; d=zohomail.com; s=zohoarc; b=mDRMD27SBhdq90Rod2W9ko8Sf6UBS0IhrNXeozuFlwG1cuQasK/3WJzj5I3ZLIDC7N+wLKkdemZdoYa8aVLwB0NrasyKmqfPA/88ouahgrlg5YwoIT8Odm3oPp2AScTqVrhir2cwXULQ7mwmXO8ED166IElkF6V6LAIpNngHqJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439873; h=Content-Type:Content-Transfer-Encoding:Cc: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=lMB0udMTS/Ce1xsh2SCCtW/VGcnmhf7a+pmaxMiCMWc=; b=FeCSrOFG54UnZf1Kfy204obVJLmWo5pvFBrUerGlB2XuRqqq8T4ML2iCjbRmBHWPvmUTRHu0l0olrXUyuNiPpvH60MULBO+36tzGUGAURL5ohwFWXYpHBDC0wKiCiUKS7fPQQBLr7UuXwTU2WYI+KyIsYdWMbGr8y3XN/r6Frj8= 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 1694439873551452.29357188439997; Mon, 11 Sep 2023 06:44:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-Q2OMesWeM-y-f_3ld-Iy_g-1; Mon, 11 Sep 2023 09:44:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC5433811F42; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EAAE40C6EA8; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8BA9C1946A66; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 763751949745 for ; Mon, 11 Sep 2023 13:43:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 71DD320235BC; Mon, 11 Sep 2023 13:43:57 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD6782026D4B; Mon, 11 Sep 2023 13:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439872; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lMB0udMTS/Ce1xsh2SCCtW/VGcnmhf7a+pmaxMiCMWc=; b=ZndmH/kkCrOVeII7My33KXDrfwlZKrw01nZI2RKY2/c2ok+d7YTaUIyWJ18wbzAHlaPHXI /DrV0COAQmExaV3WcHdH5dsHV70FtdE8UjMG3at8S7Y7Hxh93CWNEbgn1uoiL1mUmHcjEY 2JX6XEVGtHybEhkqlLIxjK29LdZVcx8= X-MC-Unique: Q2OMesWeM-y-f_3ld-Iy_g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 23/35] ci: helper: Drop _lcitool_get_targets method Date: Mon, 11 Sep 2023 15:43:24 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1694439874338100007 This method unused anywhere, so drop it. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/helper b/ci/helper index fb562d55e1..8986772153 100755 --- a/ci/helper +++ b/ci/helper @@ -163,10 +163,6 @@ class Application: output =3D subprocess.check_output([self._args.lcitool] + args) return output.decode("utf-8") =20 - def _lcitool_get_targets(self): - output =3D self._lcitool_run(["targets"]) - return output.splitlines() - def _check_stale_images(self): namespace =3D self._args.namespace gitlab_uri =3D self._args.gitlab_uri --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439873; cv=none; d=zohomail.com; s=zohoarc; b=KCTSj1PtNAlVGZ5br2/rQisYbOa0iC1eClqRaw0QBOm2bygU41homzZSvAra/ziKZquO8hmuGcwVuA45ZEuU0rfAY//YcSNdobLu0ha4td9EHRCYdRiMcbUQJfgrGKoiKEAvqze9zzBk0taQKsLAYp04y2Q7dPFi5JOuopNY+yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439873; h=Content-Type:Content-Transfer-Encoding:Cc: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=pUlWUemmuGQLmtt8gEzlS9j+VmO5HDQl41ep9DZIg+E=; b=hY7ajQ+hU81PB+5v7TVT+vQfDx9urJYwU3u5nWRGhkJWh2fLIHoPsndW86W2/MTgQLov2c82fOuUEpjv8kMGR23tmK9Xp8ltdOWHZJanMTsjurDJIjUhlgwn5g1LrKt5JEM+s7WAdIWbwlWsFq9n9sXp6ijqZFEHLUGY3EjqwNg= 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 1694439873190228.33485256809183; Mon, 11 Sep 2023 06:44:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-EevB14bqPSyB8_no3HFR7A-1; Mon, 11 Sep 2023 09:44:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B1351C06EE2; Mon, 11 Sep 2023 13:44:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA73021B2417; Mon, 11 Sep 2023 13:44:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C3D2419452C2; Mon, 11 Sep 2023 13:43:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 57A0E1949756 for ; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53795202348A; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABFF32026D4B; Mon, 11 Sep 2023 13:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439872; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pUlWUemmuGQLmtt8gEzlS9j+VmO5HDQl41ep9DZIg+E=; b=Z9CnhjEvIwtQAHBySyw0PP7nIIBXsQGGm2lIZH4Ae3W4Waa5Mg9HNNtZ0awvIX3WGxS/iv Y1K2THAC6lAFn6TvT096YnZ9Ci6bEbFSLn2VU2E7jSSOET2B49qOLLkau2+vgCLc7JkONN 2/DIBsQ48M/DJgsyAVH4ZjFlMK8wv0s= X-MC-Unique: EevB14bqPSyB8_no3HFR7A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 24/35] ci: helper: Don't make ':' literal a static part of the image tag Date: Mon, 11 Sep 2023 15:43:25 +0200 Message-ID: <690207f78deb4ed0a01b62e5f0cf089d8e2a7344.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1694439874314100005 ':' is just a connecting character, we can add it to the appropriate place later in the Python script later, but it doesn't make sense to be part of the image 'tag' string. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helper b/ci/helper index 8986772153..d3de6d96cb 100755 --- a/ci/helper +++ b/ci/helper @@ -40,7 +40,7 @@ class Parser: ) containerparser.add_argument( "--image-tag", - default=3D":latest", + default=3D"latest", help=3D"use container images with non-default tags", ) =20 --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439874; cv=none; d=zohomail.com; s=zohoarc; b=n0HI5XAmZISH7qH4c/ZoZ2dO367pEwbduf+afWk8pEoC0ojOVGkhYBbT5Vm/mtKv5cV6wnjYF1LXUNutuo6O68v2bFHTnv/xnol7jQ96lcCu0gsUEWXh5q4i7uhM1TPRsj7rYW1cb6yv35v44dffbuTtentkvTj27gu92PF4mNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439874; h=Content-Type:Content-Transfer-Encoding:Cc: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=N/DuLeMu3nQdqIYI7hwkoiLjuU8Q5I6OTTjCcgtiyVg=; b=hg9GSVihdXIH3zEBEED/37a91qTU+BXwsJJYSZgXmpIzPKmGGZo4NAzIi7lac2AIYAPpICS6kNdF4s2B3X7XI9YE8FPGXLW74YrduXpphfWJJHMiG/Q3FvVrtllSrKxhvFbfHQ1Tg8Zv/zh0fFUWyQ3xbGup7c/ytAW6oqpy19E= 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 1694439874305770.0471006725326; Mon, 11 Sep 2023 06:44:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-O9nGP800Mr6_ARLb1Q7D4w-1; Mon, 11 Sep 2023 09:44:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A47981651C; Mon, 11 Sep 2023 13:44:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30E202156711; Mon, 11 Sep 2023 13:44:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0CB8E1940376; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3638D19452C8 for ; Mon, 11 Sep 2023 13:43:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 319992023499; Mon, 11 Sep 2023 13:43:59 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D4AB2026D4B; Mon, 11 Sep 2023 13:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439873; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=N/DuLeMu3nQdqIYI7hwkoiLjuU8Q5I6OTTjCcgtiyVg=; b=LNvNjdArBHwEUL12r9eLjdbbBs2UpX1S4xP2drKNxsI9Nem2Cqh/Atv5mGycQn8ECzXumr bYicWWGCFPEMaqcXxb9WG+n39Pfsgklk2VzHWcAy4BQ9aYF7sIvrLzFeSiuyzUHbW0loWJ RQWWlcbY/I7+smH9LUlrw/qxsCqEZhE= X-MC-Unique: O9nGP800Mr6_ARLb1Q7D4w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 25/35] ci: helper: Add --lcitool-path CLI option Date: Mon, 11 Sep 2023 15:43:26 +0200 Message-ID: <419d2fa4f6b0ac51030c07f5cec93123e3e6c550.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1694439876328100013 We'll soon be relying solely on lcitool so we need to be able to run it from a user-provided location if it's not installed in a known location. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/helper b/ci/helper index d3de6d96cb..75552774f6 100755 --- a/ci/helper +++ b/ci/helper @@ -43,6 +43,12 @@ class Parser: default=3D"latest", help=3D"use container images with non-default tags", ) + containerparser.add_argument( + "--lcitool-path", + dest=3D"lcitool", + default=3D"lcitool", + help=3D"path to lcitool (default: $PATH)", + ) =20 # Options that are common to all actions that call the # project's build system --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439912; cv=none; d=zohomail.com; s=zohoarc; b=PX0vvWxYrNuQr+xTOVTSH+TRqiA5C+gkURcuMv4eo73wesZnn2gNvu/JmFei8azBSDTgp6Con4J+k9bENKhdAqe/d8dsxx4aVpSwujmDOhgv5x/ziHgQRum/sylbXrklRnr1xlAKXd6h3TTKeSw29WkAXT17p12XxH5vb2Jrn3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439912; h=Content-Type:Content-Transfer-Encoding:Cc: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=8ESvECKtbzeoH5YmOXcG1pDmzgW49rII1iAE3nnSp8k=; b=VeUZALz1yh4LTiW2CpnU0WTAmpi90DoqviTkUabh/Beoel7GsNqYGjUTPQaHezpQdKJjE8lOgZHQjoW9uL2+RJGK6vtHfvdTOxcGhTSgXhkMvsZ06TOKPpIP9kSRRcn1sRV6s10PpCD8kT43IhyZPHT0A3yBlt75OcvqY8ISlxo= 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 1694439912667472.023146463059; Mon, 11 Sep 2023 06:45:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-190-AgA9ZWmTNPS55SdXlny1yA-1; Mon, 11 Sep 2023 09:44:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 125383C13923; Mon, 11 Sep 2023 13:44:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE63640C2064; Mon, 11 Sep 2023 13:44:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C08E61946A44; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3F0B319465B7 for ; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0FF082026608; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B9A42023168; Mon, 11 Sep 2023 13:43:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439911; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8ESvECKtbzeoH5YmOXcG1pDmzgW49rII1iAE3nnSp8k=; b=LogbrOdCSChn1Uvnx9fa8HKKaGW4dFY+eh6wPx8jNv6u4wH9gVdXsb5JxKAHtBtWrQs2wp L7Bi1BOoqV5T4Dbh10XgzsbOiKjYIxOdjX9hwNaUJCBvgmGYdNi0Y2RRTwaro5cdRw+P2N pIdbRdMS7FYEtzCLrNI+qo3Q6EKngBw= X-MC-Unique: AgA9ZWmTNPS55SdXlny1yA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 26/35] ci: helper: Add a required_deps higher order helper/decorator Date: Mon, 11 Sep 2023 15:43:27 +0200 Message-ID: <132a11e6d61d65a0418e7f1077b03faa2cf39a7c.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694439913238100001 Since we'll depend on GitPython for repo cloning, we need to make sure to emit a user friendly error if the module is not installed. This patch introduces a helper which future patches will use as a decorator. Inspiration for this helper has been taken out of lcitool where we use an identical helper for this purpose. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ci/helper b/ci/helper index 75552774f6..4727145b28 100755 --- a/ci/helper +++ b/ci/helper @@ -14,6 +14,28 @@ import textwrap import util =20 =20 +def required_deps(*deps): + module2pkg =3D { + "git": "GitPython" + } + + def inner_decorator(func): + def wrapped(*args, **kwargs): + cmd =3D func.__name__[len('_action_'):] + for dep in deps: + try: + import importlib + importlib.import_module(dep) + except ImportError: + pkg =3D module2pkg[dep] + msg =3D f"'{pkg}' not found (required by the '{cmd}' c= ommand)" + print(msg, file=3Dsys.stderr) + sys.exit(1) + func(*args, **kwargs) + return wrapped + return inner_decorator + + class Parser: def __init__(self): # Options that are common to all actions that use containers --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439906; cv=none; d=zohomail.com; s=zohoarc; b=Nw08kgxPh33EuUYjfcQYwhBY3yuKLGaQI8jwU0PtDuWf6PO6YIA5uvNieHGFsLKfDP6FChSJLi5kRpeJEaIa0CuxL/PaCqeutXAnGzMjdFIPs32E/mMBZunHlOsfzDM8HnAQtOPXFFp+x1zFKTkJVhDiDNhiQykXzJHtpOt3uTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439906; h=Content-Type:Content-Transfer-Encoding:Cc: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=UKEXZQtqOh10DY2dat5/+b8p6WAWjNfr7gyfHIsErp4=; b=ckF+NyKuHeScz7w83axgS+nh9mq5HytG97siZlj6cmIA7LBvkUKBEhb/K02yj24wAOdBYf8nP7TTej6S6/7zEuD3aKh0wYvLF0/R6Z5yW/UKfW62eigEn+0uy4judIxP8h4i/xRNuLiyRI1opIV5N/gO/Qw2Xhplel2D6oGxoPI= 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 1694439906116160.25943471070048; Mon, 11 Sep 2023 06:45:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-207--dCRUCtPOYW45B8pjNj0cQ-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DAB25181EC53; Mon, 11 Sep 2023 13:44:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF3812026D4B; Mon, 11 Sep 2023 13:44:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 15270194E009; Mon, 11 Sep 2023 13:44:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0047819465BB for ; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E8DA020268C8; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A3A32026D4B; Mon, 11 Sep 2023 13:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439905; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UKEXZQtqOh10DY2dat5/+b8p6WAWjNfr7gyfHIsErp4=; b=aFbTnuJytOdfQC5Vffesyh5weGXQ8SYyI3Yi0CggKH+FASqC+LkMBvo1NfSvAqRXfZzteB 3lmneO/6ZTsvQNJ1ocUjEJs7UXRnmiUVVh2mOqR8j2rMnQEkrpBNdN7cFMEdU9yVkZScEw DLtdtN5/CAsFYbmi82ZPbg5MUQITXxQ= X-MC-Unique: -dCRUCtPOYW45B8pjNj0cQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 27/35] ci: helper: Add Python code hangling git clones Date: Mon, 11 Sep 2023 15:43:28 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1694439907058100003 This helper will be utilized by a future patch which will add the lcitool container execution logic. The reason why the required_deps decorator isn't being used here is because this is a property. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/helper b/ci/helper index 4727145b28..6aca089db4 100755 --- a/ci/helper +++ b/ci/helper @@ -159,9 +159,18 @@ class Parser: =20 =20 class Application: + @property + def repo(self): + if self._repo is None: + from git import Repo + + self._repo =3D Repo(search_parent_directories=3DTrue) + return self._repo + def __init__(self): self._basedir =3D pathlib.Path(__file__).resolve().parent self._args =3D Parser().parse() + self._repo =3D None =20 def _make_run(self, target): args =3D [ --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439967; cv=none; d=zohomail.com; s=zohoarc; b=L8Up128Pqa0Dhl6XQL9c9rA7ZbgmThdMsRCHYZUMSWV5OnCcReK9YkiZIeeoXlujcW8XuSwfORyrT8Q/2wdpdTiOiL/eoDxpi5WV5e4GEvT926LE2bcVaNgwWzLtsjtQwRb/XLetdZ9kDLQEtEkd01zCrfJc/Fsc7QE/QkjDtKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439967; h=Content-Type:Content-Transfer-Encoding:Cc: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=TqY5pfDLhAktA2Mq6USyYhAWo53BP4NQw70GikBF7CI=; b=a732d71LWGmq+bhcqGREPeXHgSx+Bd+ziMpY1R5df2QC4VShCN+aX8Z46vhglO8UXx2G21mdUGbffQ0Y6LeUR7pCcH4CdVMNQRMosCdfc+8QFKk8f3zQsWsEh9wu3vGe3hq6pTwT4qpKn2ZPX93I+9YUi2FKi4Ov0nqg+lfS9uU= 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 1694439967817640.1610180657658; Mon, 11 Sep 2023 06:46:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-renEZPxpNTmOWVdh1YQ8vA-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C927F8F8767; Mon, 11 Sep 2023 13:44:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B466D2027045; Mon, 11 Sep 2023 13:44:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 853FC1946A70; Mon, 11 Sep 2023 13:44:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D7CC91946A67 for ; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C4D0B202348A; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B1292026D4B; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439965; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TqY5pfDLhAktA2Mq6USyYhAWo53BP4NQw70GikBF7CI=; b=DvSENRXyOgN11W+hBMg9yuOcOQuxJTkkZxGpwsBHIB6wu0SCKYdtEaYlOhoZ4SfIDwn8u6 vvFil/KcE4zoacaYSVH5cu+K2mgKhurRluYMyeGOW3Azc6yYJRfa7JskH/waJ3QjqcR7xK Jao9YBfU2iVL91IOhqYi245FzofYWAM= X-MC-Unique: renEZPxpNTmOWVdh1YQ8vA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 28/35] ci: helper: Add a helper to create a local repo clone Pythonic way Date: Mon, 11 Sep 2023 15:43:29 +0200 Message-ID: <067c3001bbf65a6f191fd217edd842f045a97e94.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1694439969094100001 A proper Python equivalent of 'git clone --local'. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/helper b/ci/helper index 6aca089db4..392702ae41 100755 --- a/ci/helper +++ b/ci/helper @@ -196,6 +196,10 @@ class Application: if pty.spawn(["make"] + args) !=3D 0: sys.exit("error: 'make' failed") =20 + @staticmethod + def _prepare_repo_copy(repo, dest): + return repo.clone(dest, local=3DTrue) + def _lcitool_run(self, args): output =3D subprocess.check_output([self._args.lcitool] + args) return output.decode("utf-8") --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439964; cv=none; d=zohomail.com; s=zohoarc; b=DA8gPNT4UZqeTdLQLDqOpLdIROZjyLjjTsa3OdXqFhQNMwpw4qvFlDvlIny+S+0nfT8uQuWkvYturCpa01Riv17VuXHs6UZ8zvhUBDbYn903Yy8+IThCoW6gXbbaXh5MmEks9tTV1NnjVfy9kGGGKo34F5eYQmDHmgpw63hqTwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439964; h=Content-Type:Content-Transfer-Encoding:Cc: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=JzGzO1XD+9xlb1dGLhM29IOU3YJsjW63rTyCgipcpiQ=; b=nOOmk2mD1k2gbwLydIRoAYOAfiK07NG/8lvEP3cmQzywJKXtPF3OfL6pwCMsxiWKo1vUV5XkhyCebkzRkFGBycvOFNP2s2bnaO/jM6g2f3XG8SDIEZmFbFPgq6UeRHFBkU5Yi6XRlQNgwnsDavlRwqtBIfH0QnJA0h5HIWCGC+8= 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 1694439964048663.4870259214787; Mon, 11 Sep 2023 06:46:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-387-9fBe32pcN6ibvhSC0KuZ2g-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7E641046331; Mon, 11 Sep 2023 13:44:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1F7021B2415; Mon, 11 Sep 2023 13:44:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 109BE19452D9; Mon, 11 Sep 2023 13:44:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B7BFF19452D2 for ; Mon, 11 Sep 2023 13:44:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AAEF42023163; Mon, 11 Sep 2023 13:44:02 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A3BD2026D4B; Mon, 11 Sep 2023 13:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439962; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JzGzO1XD+9xlb1dGLhM29IOU3YJsjW63rTyCgipcpiQ=; b=GZtFB+zpuGnba03gVdOREVqxHnwhJU9vWSh+Rj7iDmb5I1ctyMqmypsUbYquSIxkgbBviW LvELtYscXm7yx76CKEEE0oW0+/yGV+J2TBXDf9Y2+CtwOk4wcY+5KcZUK4081q9WJJJEDN LTvcOsZd5jzdGqvZFuQMztiNHu/2UJc= X-MC-Unique: 9fBe32pcN6ibvhSC0KuZ2g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 29/35] ci: helper: Rework _lcitool_run method logic Date: Mon, 11 Sep 2023 15:43:30 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1694440016692100001 This method wasn't even utilized before this patch. This patch adds all the necessary logic to successfully execute a container workload via lcitool (which will later allow us to ditch ci/Makefile). Because container executions via lcitool creates the following inside the container: $ ls script datadir where 'datadir' is the workload directory (in this case a local git repo clone) and 'script' is the code that runs whatever the workload is over 'datadir'. In order to satisfy the ^above, our helper generates a trivial temporary 'script' that will source ci/build.sh and run whatever was specified as --job essentially to simulate the exact steps a GitLab pipeline job would go through. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/ci/helper b/ci/helper index 392702ae41..fce370f995 100755 --- a/ci/helper +++ b/ci/helper @@ -11,6 +11,9 @@ import subprocess import sys import textwrap =20 +from pathlib import Path +from tempfile import TemporaryDirectory + import util =20 =20 @@ -201,8 +204,56 @@ class Application: return repo.clone(dest, local=3DTrue) =20 def _lcitool_run(self, args): - output =3D subprocess.check_output([self._args.lcitool] + args) - return output.decode("utf-8") + positional_args =3D ["container"] + opts =3D ["--user", self._args.login] + tmpdir =3D TemporaryDirectory(prefix=3D"scratch", + dir=3DPath(self.repo.working_dir, "ci"= )) + + repo_dest_path =3D Path(tmpdir.name, "libvirt.git").as_posix() + repo_clone =3D self._prepare_repo_copy(self.repo, repo_dest_path) + opts.extend(["--workload-dir", repo_clone.working_dir]) + + if self._args.job =3D=3D "shell": + positional_args.append("shell") + else: + job2func =3D { + "test": "run_test", + "build": "run_build", + "codestyle": "run_codestyle", + "potfile": "run_potfile", + "rpmbuild": "run_rpmbuild", + "website": "run_website_build", + } + + if self._args.engine !=3D "auto": + positional_args.extend(["--engine", self._args.engine]) + + with open(Path(tmpdir.name, "script"), "w") as f: + script_path =3D f.name + contents =3D textwrap.dedent(f"""\ + #!/bin/sh + + cd datadir + . ci/jobs.sh + + {job2func[self._args.job]} + """) + + f.write(contents) + + positional_args.append("run") + opts.extend(["--script", script_path]) + + opts.append(f"{self._args.image_prefix}{self._args.target}:{self._= args.image_tag}") + proc =3D None + try: + proc =3D subprocess.run([self._args.lcitool] + positional_args= + opts) + except KeyboardInterrupt: + sys.exit(1) + finally: + # this will take care of the generated script file above as we= ll + tmpdir.cleanup() + return proc.returncode =20 def _check_stale_images(self): namespace =3D self._args.namespace --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439912; cv=none; d=zohomail.com; s=zohoarc; b=Qy+PaKTrHQNOfspJ+PW1yOJ6J1oYERXzeYJwD+wen0yYcUi8ClZSex96zDYjlELIJlnKCzZcFoh5TDqwUEaMycs677J8Q7U9zl3YUNCYKwlrkdRhaEYuFLGZc5Uj4kojzKMTI+qoJ0H6G+Afo6q1xTrPQGJuLA7PYI7WBiv178Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439912; h=Content-Type:Content-Transfer-Encoding:Cc: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=pTfIffBEludTASFANMyxK9xzo8GnF+S6lr716huggh4=; b=SAggvv5YwNElNoB04kfFAgD8+eOeJhC5EYxyhbFDO9sCCWXT5btu/O+b6mPAYCWqnCi9LiZmtuQUMJuq0yIVVbsLeWjjsqKK91eF0nFpwkg8l/C7FHMzVvKsVtf7OYDXGmya7OYLYxBaKYLnKF5TfH4cBQul4TbC/ac5RGfXZDA= 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 1694439912032284.7740781152322; Mon, 11 Sep 2023 06:45:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-43-zticCAjbOCKkyjflXORZZQ-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCE5F181EC40; Mon, 11 Sep 2023 13:44:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7BC340C2064; Mon, 11 Sep 2023 13:44:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C70E61946A7B; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A57881946A72 for ; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 86B822027047; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1C932024CAE; Mon, 11 Sep 2023 13:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439911; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pTfIffBEludTASFANMyxK9xzo8GnF+S6lr716huggh4=; b=en7YqycF6cnUXmWoz1VMd4g1M7K9rOH2InUHlqiaOOnEXUPuiOBxL+91xQNo4AEaB9BX6M M93O1kD/PFe7kbWMBO7uhntnncjx3d9BgMNdTZNQ+x91nSySMQyE/q33t0rbijkk7wZAet v8Zhy/NQHpAba4iNQELGbL2l7jiZHOQ= X-MC-Unique: zticCAjbOCKkyjflXORZZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 30/35] ci: helper: Add an action to run the container workload via lcitool Date: Mon, 11 Sep 2023 15:43:31 +0200 Message-ID: <62c10da6b83de14d8c222ff42fdf87ceb3d69259.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694439913613100003 Just like with the other CLI sub-commands, add an action to run a GitLab spec job in a local container via lcitool. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/helper b/ci/helper index fce370f995..f7b0204ea0 100755 --- a/ci/helper +++ b/ci/helper @@ -295,6 +295,10 @@ class Application: def _action_shell(self): self._make_run(f"ci-shell@{self._args.target}") =20 + @required_deps("git") + def _action_run(self): + return self._lcitool_run(self._args.job) + def _action_list_images(self): registry_uri =3D util.get_registry_uri(self._args.namespace, self._args.gitlab_uri) --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439875; cv=none; d=zohomail.com; s=zohoarc; b=QOPKmJ5HG0ANUT91TuiSayq6Rk6g4Z5QIoGeUelFs9tOkbRFc3j0LhmbNs5PfhjBWbWkfFUk+kEsiXydVoVRGkqBjPwnc0cn1NKl9lgA9ePNZ9hYN7np02z2EVJcKSmYbd9iLk43o77W9yuA2I0jf/eQScgghCd/e+jZe6ztVeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439875; h=Content-Type:Content-Transfer-Encoding:Cc: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=i68VcK/zk7MI/PmKSeFBZ7JP72FSUMzV5m78UQcKG68=; b=RHVfZXKcJFe3/CJbtfhUH4D2WV0+b9Cz5/LrBdHWlMkH7ZU8d+/+R3pax1LEI74YiF9JCwZ6/nUY5+LnU05YG83QJlR04wxmSs3PCo5gCnWelzno1Z7IPKQlA7VJvPvnmeoLyN2uv8xQjd+tET4RIrZGHTPNq2DJ9dWhoZCBE4E= 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 169443987588740.446506642258555; Mon, 11 Sep 2023 06:44:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-EF_irTsnNTC0LKO6hGz5zg-1; Mon, 11 Sep 2023 09:44:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AAE98AF797; Mon, 11 Sep 2023 13:44:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35AD010F1BE7; Mon, 11 Sep 2023 13:44:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5F32619451C8; Mon, 11 Sep 2023 13:44:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 843661946A41 for ; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 65D412027045; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id C155C2022EBC; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439875; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i68VcK/zk7MI/PmKSeFBZ7JP72FSUMzV5m78UQcKG68=; b=ddkHG+kp4ESzr/GFxQz0CLpCpxce+HSfOK6QXnVAuYPhauOWDyARX1+yqiWRnxom3ol0q2 SvEGcziMNWwgggB9dqkh6CDsb9RN83pAB/Gy8shIMdgsqomChZQUVNYaxdPwwv4bHvGtaE 3/G/rnfu+0wWAqbnW8grEUm6+j8sw/c= X-MC-Unique: EF_irTsnNTC0LKO6hGz5zg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 31/35] ci: helper: Add a job argparse subparser Date: Mon, 11 Sep 2023 15:43:32 +0200 Message-ID: <9534745eed371ae6877d0c30857686ae63712e7a.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1694439876330100014 The idea behind this subcommand is to follow whatever build job we have defined in the GitLab CI pipeline, so that we only have a single source of truth for the recipes. Adds 'shell' as an extra option for interactive container build debugging. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/helper b/ci/helper index f7b0204ea0..bc5de008b2 100755 --- a/ci/helper +++ b/ci/helper @@ -139,6 +139,21 @@ class Parser: ) shellparser.set_defaults(func=3DApplication._action_shell) =20 + jobparser =3D subparsers.add_parser( + "run", + help=3D"Run a GitLab CI job or 'shell' in a local environment", + parents=3D[containerparser], + formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, + ) + jobparser.add_argument( + "--job", + choices=3D["build", "codestyle", "potfile", "rpmbuild", + "shell", "test", "website"], + default=3D"build", + help=3D"Run a GitLab CI job or 'shell' in a local environment", + ) + jobparser.set_defaults(func=3DApplication._action_run) + # list-images action listimagesparser =3D subparsers.add_parser( "list-images", --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439912; cv=none; d=zohomail.com; s=zohoarc; b=eqYv47JZVg2KF7qdrv5h+KNrLnH2uie9V6ZkqR9gBpdoVlPIV639r+Aq9M5hyZSxqY1a+RfGuVUqzJco/7R7eNgSNwwy/f4Fr1KcU3U6x5Q30XCCixE1IHXZ052GP/TUWpincQEBTO1Heq8Q/XpbOJxZYS4M0iFUB5QeTb2HP2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439912; h=Content-Type:Content-Transfer-Encoding:Cc: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=7t+R6yrZP3vLWDUZ+pI2DQHr1UrdNPiXrav1fbFsW2Q=; b=fOfzUvxO4hn/yyQUqAc15/HwVTvrnLl6xEpdENhEBjNa5UJGH9RmIOfVDrVXrFYfTblsT2e47cCSf9QVVyNgqDqF0X5a9pBsSOIJiosnxVXxPnI49pJJoi349J/P/E7ACJnH5IEhWYZaibELCVF5f+a4GPaPM5g1Mm/pid33VZA= 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 1694439912502770.8186130495121; Mon, 11 Sep 2023 06:45:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-478-BxRXGoarMuGWfHdNxr1U0A-1; Mon, 11 Sep 2023 09:44:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F610281CC4A; Mon, 11 Sep 2023 13:44:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3494D202348A; Mon, 11 Sep 2023 13:44:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6081E193F51D; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5BF3619451D2 for ; Mon, 11 Sep 2023 13:44:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 451662022EBE; Mon, 11 Sep 2023 13:44:05 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FB4A20268C8; Mon, 11 Sep 2023 13:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439911; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7t+R6yrZP3vLWDUZ+pI2DQHr1UrdNPiXrav1fbFsW2Q=; b=EtOhyhmw1S7fx9rFfilSUbq9ST4hndFtJeHbMoejISsS1kVMAh5bFua9whHNoe0tgyA8hA gZvMpmqNpSTgUQwSgknBDzZ8mbG+2GC3YM3dejd9nLYMI03oFye1Doec/EBSWXTdbcrssW ZbKlShQ4Rq89TTvFzf/N02+F5u8q4fw= X-MC-Unique: BxRXGoarMuGWfHdNxr1U0A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/35] ci: helper: Drop original actions Date: Mon, 11 Sep 2023 15:43:33 +0200 Message-ID: <4b2ead209c875cb5d09a36febbed4e060ba23fbd.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1694439913631100004 Previous patches added a single 'run' command parametrized with GitLab job specs via '--job' that cover all of these original actions, adding some more in the process. Drop the original actions as we don't need them anymore. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/ci/helper b/ci/helper index bc5de008b2..b90dc56ede 100755 --- a/ci/helper +++ b/ci/helper @@ -112,33 +112,6 @@ 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], - formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, - ) - buildparser.set_defaults(func=3DApplication._action_build) - - # test action - testparser =3D subparsers.add_parser( - "test", - help=3D"run a build in a container (including tests)", - parents=3D[containerparser, mesonparser], - formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, - ) - testparser.set_defaults(func=3DApplication._action_test) - - # shell action - shellparser =3D subparsers.add_parser( - "shell", - help=3D"start a shell in a container", - parents=3D[containerparser], - formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, - ) - shellparser.set_defaults(func=3DApplication._action_shell) - jobparser =3D subparsers.add_parser( "run", help=3D"Run a GitLab CI job or 'shell' in a local environment", @@ -301,15 +274,6 @@ class Application: """) print(msg.replace("STALE_DETAILS", stale_details)) =20 - def _action_build(self): - self._make_run(f"ci-build@{self._args.target}") - - 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}") - @required_deps("git") def _action_run(self): return self._lcitool_run(self._args.job) --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694440024; cv=none; d=zohomail.com; s=zohoarc; b=FkxOACZ8sM/vjpi55lg3I9W93p62dI02RZLXYwOm3daNDmXDwGhEDhxrXDeWJR9hE1ocsfk0ogNPStKtmqwqeYnwlRqRUoyaJJE9t5mUhR4bemjEveX2iyN8bwufUq+h18RHNmeu756epZIXzlqfgZDKKp3sc4u2EWaX9KFu8r4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694440024; h=Content-Type:Content-Transfer-Encoding:Cc: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=f2uaGGnclw1POfb9Tzca/lGRmN66Id6+p7JJGSDwcig=; b=ZX2k/cw3FLSyXtZkNYwRkwfyya2Cl92tNsAZPurOU6qJvADNUP+K4WIjwhP0QBKQsi/pIboBhDSAu1FlSp7NTghVmaw+ZQRNJWV4c2yzeFPu+kqR9nGh8j8pyX+vcMQc5V5wN9BsBYeUAZ5YxieW62E3DSx+3Ei6ivAp5oRsOdA= 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 1694440024160325.95858531457407; Mon, 11 Sep 2023 06:47:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-453-X7uW7YSVP0SyzwuF8G5FkQ-1; Mon, 11 Sep 2023 09:44:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22570381CC1D; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A5F12022EBE; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 97B7B194E11F; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 34D471946A49 for ; Mon, 11 Sep 2023 13:44:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 278382022EBD; Mon, 11 Sep 2023 13:44:06 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F2EB2022EBC; Mon, 11 Sep 2023 13:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694440023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=f2uaGGnclw1POfb9Tzca/lGRmN66Id6+p7JJGSDwcig=; b=HNipHwtzoCvOZqcEW5fKfy5HCTWLJDL0d0TSw5tNfa5K71KFrBRXpseqOuCPGnTqFxGTL5 SkgNoRzq9JCTeU3IBDGYCX+Aj2ri3VzgShFd5IenzR510dvJCVdMitBkZ3H6FRkeJvys99 bGywObou3oANvX1nqacibZi3AdwtF50= X-MC-Unique: X7uW7YSVP0SyzwuF8G5FkQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 33/35] ci: helper: Drop the --meson-args/--ninja-args CLI options Date: Mon, 11 Sep 2023 15:43:34 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1694440026169100001 These originally allowed customizing the ci/Makefile script which was the core of the local container executions. The problem was that however flexible this may have been, it never mirrored what was being done as part of the GitLab jobs. Motivated by the effort of mirroring GitLab jobs locally, these would only ever make sense to be set/used in interactive shell container sessions where the developer is perfectly capable of using the right meson/ninja CLI options directly without going through another shell variable indirection as it was the case with these ci/helper options. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ci/helper b/ci/helper index b90dc56ede..c734629731 100755 --- a/ci/helper +++ b/ci/helper @@ -75,21 +75,6 @@ class Parser: help=3D"path to lcitool (default: $PATH)", ) =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 " - "(eg --meson-args=3D'-Dopt1=3Denabled -Dopt2=3Ddisabled')= ", - ) - mesonparser.add_argument( - "--ninja-args", - default=3D"", - help=3D"additional arguments passed to ninja", - ) - # Options that are common to actions communicating with a GitLab # instance gitlabparser =3D argparse.ArgumentParser(add_help=3DFalse) --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439907; cv=none; d=zohomail.com; s=zohoarc; b=dc2k17EgkK/JQkdqGDOR2mR5SsYA3qaQARq+/eT6DZZ5P2rnocJRsK+rqJaFpWPTnOWnhYF1HZOOF+/itp8lqTqT21+e/UFsn1oATtwUSSc9LU77R58tQKSoRV8AT5HzxXQUiDoC3wSNLM5bnLwn4z9INk7gKyo3Ct4S1gj0yMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439907; h=Content-Type:Content-Transfer-Encoding:Cc: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=J92xd2bi1sSfs91LjHAnOsraf/0fx8/4gwsMGL2E3CQ=; b=AywVNq25dkSzNrfOblWkF8NNN8JT3b1x9Zi9S+yoFOPYLl2OGClzWzaHinIaIpgkvgsg1X+du6Zkwffh+toiVwDmWr0eu6mdqwIJS7oULy86sVKEucrIlkGTXuciN99L4x8O9jWwG0vk0x8SA6t24UdgbfA2HJxjEnaJffKoKHk= 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 1694439907046218.8428387138415; Mon, 11 Sep 2023 06:45:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-204-b1xmYbetPluzDOQiF9HyLw-1; Mon, 11 Sep 2023 09:44:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F09BB381DCA6; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA21D63F45; Mon, 11 Sep 2023 13:44:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A0D0819451FB; Mon, 11 Sep 2023 13:44:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1827E19451F5 for ; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0A7132026608; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65D48202348A; Mon, 11 Sep 2023 13:44:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439906; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J92xd2bi1sSfs91LjHAnOsraf/0fx8/4gwsMGL2E3CQ=; b=YZAQa7yyNyterkEspgnOe37JckQ+HexrVMfkAXb+EqdpMwewe1VIt+qe0jovKscPYagoIn 7VVUiEKPIuDAsxKQTM7Uq27Jr/ZIOyAq5KKZRgGjzCUpAW4NF3BP30wbCQ3XvzPY/D4DBF WKMwHLSvFlMB5ZOXqa57FOrNNL/t5Mw= X-MC-Unique: b1xmYbetPluzDOQiF9HyLw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 34/35] ci: helper: Drop the _make_run method Date: Mon, 11 Sep 2023 15:43:35 +0200 Message-ID: <6e11dea6bc631f9575df0c5e32ef554d37b72a89.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1694439909119100007 We've successfully migrated over to lcitool to take care of the container workload execution, so dropping this 'make' prep code is a prerequisite of finally getting rid of the ci/Makefile script. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/helper | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/ci/helper b/ci/helper index c734629731..93508515ca 100755 --- a/ci/helper +++ b/ci/helper @@ -6,7 +6,6 @@ import argparse import os import pathlib -import pty import subprocess import sys import textwrap @@ -148,30 +147,6 @@ class Application: self._args =3D Parser().parse() self._repo =3D None =20 - def _make_run(self, target): - args =3D [ - "-C", - self._basedir, - target, - ] - - 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}", - f"CI_IMAGE_PREFIX=3D{self._args.image_prefix}", - f"CI_IMAGE_TAG=3D{self._args.image_tag}", - ]) - - if self._args.action in ["build", "test"]: - args.extend([ - f"MESON_ARGS=3D{self._args.meson_args}", - f"NINJA_ARGS=3D{self._args.ninja_args}", - ]) - - if pty.spawn(["make"] + args) !=3D 0: - sys.exit("error: 'make' failed") - @staticmethod def _prepare_repo_copy(repo, dest): return repo.clone(dest, local=3DTrue) --=20 2.41.0 From nobody Sat May 11 11:43:29 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=1694439876; cv=none; d=zohomail.com; s=zohoarc; b=emR74DbvnmdJPnuKgunwvRr+guBolihf3VuB8QaAftVhyNivmFOft4g1k589jfONh3TrInzDOyAvMPWuQjI2QlYFYbxQbMpoOluyApMGNXomZPLYqnCVkiJOtz5RNB2OV1YaPWOSHJuN3+OI+uMMPIql7a+uzKz4u3Eu/rLdbOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439876; h=Content-Type:Content-Transfer-Encoding:Cc: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=bTYckOtKdE6Na66xmrIPHmFzskedcFR50+3EnPTTnfM=; b=CrFGkm8Z4GXyg4A+gvxbJHWSxU0+EvjMI1yqFz59bEG5OcCM4csnEqbNzETJTPD6/EKRXaXTVgdA9zitmRhlkhR9uTrqdEi0IxUpJ5rjW7sdOfdItbxi0AwQS5xYNXOBmH9L94hOQ+H3CbjUBuaU40Zta6q7QU6mgU96ESoAdLw= 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 1694439876931945.2027782622018; Mon, 11 Sep 2023 06:44:36 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-zfA19mJzN7K0nD6jDINQeA-1; Mon, 11 Sep 2023 09:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E1811C11817; Mon, 11 Sep 2023 13:44:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A4FF40C2064; Mon, 11 Sep 2023 13:44:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EC480194E127; Mon, 11 Sep 2023 13:44:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB372194E125 for ; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DDC052024CD5; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 454C12027046; Mon, 11 Sep 2023 13:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439875; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bTYckOtKdE6Na66xmrIPHmFzskedcFR50+3EnPTTnfM=; b=QFYmS2RJ8Dlh7wC4jL7TKA3p/GBFVVInIHvMMgRcKKlSoltgaiWndu3HkRPS/XFKB40u6i DLSJd1aOeoUUUZD5vAzoDSm3LEn3Yx4FrHDBFZfdooBydOtxuH1rdGpRyfewpIq/rOmdId JfK6rGXGfARuVhAhX+wwLzDCjKmzvYQ= X-MC-Unique: zfA19mJzN7K0nD6jDINQeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 35/35] ci: Drop the now unused Makefile Date: Mon, 11 Sep 2023 15:43:36 +0200 Message-ID: <81c09e016029f5f2bcfdb76791f8bf788780f5ce.1694439815.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694439877240100017 All the functionality this script provided has been incorporated either in the Python ci/helper tool or lcitool directly. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 Erik Skultety : --- ci/Makefile | 245 ---------------------------------------------------- 1 file changed, 245 deletions(-) delete mode 100644 ci/Makefile diff --git a/ci/Makefile b/ci/Makefile deleted file mode 100644 index 8f1be4318d..0000000000 --- a/ci/Makefile +++ /dev/null @@ -1,245 +0,0 @@ -# -*- makefile -*- -# vim: filetype=3Dmake - -# The root directory of the libvirt.git checkout -CI_GIT_ROOT =3D $(shell git rev-parse --show-toplevel) - -# The root directory for all CI-related contents -CI_ROOTDIR =3D $(CI_GIT_ROOT)/ci - -# The directory holding content on the host that we will -# expose to the container. -CI_SCRATCHDIR =3D $(CI_ROOTDIR)/scratch - -# The directory holding the clone of the git repo that -# we will expose to the container -CI_HOST_SRCDIR =3D $(CI_SCRATCHDIR)/src - -# The directory holding the source inside the -# container, i.e. where we want to expose -# the $(CI_HOST_SRCDIR) directory from the host -CI_CONT_SRCDIR =3D $(CI_USER_HOME)/libvirt - -# Script containing build instructions -CI_BUILD_SCRIPT =3D $(CI_ROOTDIR)/build.sh - -# Location of the container images we're going to pull -# Can be useful to override to use a locally built -# image instead -CI_IMAGE_PREFIX =3D registry.gitlab.com/libvirt/libvirt/ci- - -# The default tag is ':latest' but if the container -# repo above uses different conventions this can override it -CI_IMAGE_TAG =3D :latest - -# We delete the virtual root after completion, set -# to 0 if you need to keep it around for debugging -CI_CLEAN =3D 1 - -# We'll always freshly clone the virtual root each -# time in case it was not cleaned up before. Set -# to 1 if you want to try restarting a previously -# preserved env -CI_REUSE =3D 0 - -# We need the user's login and home directory to prepare the -# environment the way some programs expect it -CI_USER_LOGIN =3D $(shell whoami) -CI_USER_HOME =3D $(shell eval echo "~$(CI_USER_LOGIN)") - -# We also need the container process to run with current host IDs -# so that it can access the passed in build directory -CI_UID =3D $(shell id -u "$(CI_USER_LOGIN)") -CI_GID =3D $(shell id -g "$(CI_USER_LOGIN)") - -CI_ENGINE =3D auto -# Container engine we are going to use, can be overridden per make -# invocation, if it is not we try podman and then default to docker. -ifeq ($(CI_ENGINE),auto) - override CI_ENGINE =3D $(shell podman version >/dev/null 2>&1 && echo pod= man || echo docker) -endif - -# IDs you run as do not need to exist in -# the container's /etc/passwd & /etc/group files, but -# if they do not, then libvirt's 'ninja test' will fail -# many tests. - -# We do not directly mount /etc/{passwd,group} as Docker -# is liable to mess with SELinux labelling which will -# then prevent the host accessing them. And podman cannot -# relabel the files due to it running rootless. So -# copying them first is safer and less error-prone. -CI_PWDB_MOUNTS =3D \ - --volume $(CI_SCRATCHDIR)/group:/etc/group:ro,z \ - --volume $(CI_SCRATCHDIR)/passwd:/etc/passwd:ro,z \ - $(NULL) - -CI_HOME_MOUNTS =3D \ - --volume $(CI_SCRATCHDIR)/home:$(CI_USER_HOME):z \ - $(NULL) - -CI_SCRIPT_MOUNTS =3D \ - --volume $(CI_SCRATCHDIR)/build:$(CI_USER_HOME)/build:z \ - $(NULL) - -# Docker containers can have very large ulimits -# for nofiles - as much as 1048576. This makes -# libvirt very slow at exec'ing programs. -CI_ULIMIT_FILES =3D 1024 - -ifeq ($(CI_ENGINE),podman) - # Podman cannot reuse host namespace when running non-root - # containers. Until support for --keep-uid is added we can - # just create another mapping that will do that for us. - # Beware, that in {uid,git}map=3Dcontainer_id:host_id:range, the - # host_id does actually refer to the uid in the first mapping - # where 0 (root) is mapped to the current user and rest is - # offset. - # - # In order to set up this mapping, we need to keep all the - # user IDs to prevent possible errors as some images might - # expect UIDs up to 90000 (looking at you fedora), so we don't - # want the overflowuid to be used for them. For mapping all - # the other users properly, some math needs to be done. - # Don't worry, it's just addition and subtraction. - # - # 65536 ought to be enough (tm), but for really rare cases the - # maximums might need to be higher, but that only happens when - # your /etc/sub{u,g}id allow users to have more IDs. Unless - # --keep-uid is supported, let's do this in a way that should - # work for everyone. - CI_MAX_UID =3D $(shell sed -n "s/^$(CI_USER_LOGIN):[^:]\+://p" /etc/subui= d) - CI_MAX_GID =3D $(shell sed -n "s/^$(CI_USER_LOGIN):[^:]\+://p" /etc/subgi= d) - ifeq ($(CI_MAX_UID),) - CI_MAX_UID =3D 65536 - endif - ifeq ($(CI_MAX_GID),) - CI_MAX_GID =3D 65536 - endif - CI_UID_OTHER =3D $(shell echo $$(($(CI_UID)+1))) - CI_GID_OTHER =3D $(shell echo $$(($(CI_GID)+1))) - CI_UID_OTHER_RANGE =3D $(shell echo $$(($(CI_MAX_UID)-$(CI_UID)))) - CI_GID_OTHER_RANGE =3D $(shell echo $$(($(CI_MAX_GID)-$(CI_GID)))) - - ifneq ($(CI_UID), 0) - CI_PODMAN_ARGS =3D \ - --uidmap 0:1:$(CI_UID) \ - --uidmap $(CI_UID):0:1 \ - --uidmap $(CI_UID_OTHER):$(CI_UID_OTHER):$(CI_UID_OTHER_RANGE) \ - --gidmap 0:1:$(CI_GID) \ - --gidmap $(CI_GID):0:1 \ - --gidmap $(CI_GID_OTHER):$(CI_GID_OTHER):$(CI_GID_OTHER_RANGE) \ - $(NULL) - endif -endif - -# Args to use when cloning a git repo. -# -c stop it complaining about checking out a random hash -# -q stop it displaying progress info for local clone -# --local ensure we don't actually copy files -CI_GIT_ARGS =3D \ - -c advice.detachedHead=3Dfalse \ - -q \ - --local \ - $(NULL) - -# Args to use when running the container -# --rm stop inactive containers getting left behind -# --user we execute as the same user & group account -# as dev so that file ownership matches host -# instead of root:root -# --workdir we change to user's home dir in the container -# before running the workload -# --volume to pass in the cloned git repo & config -# --ulimit lower files limit for performance reasons -# --interactive -# --tty Ensure we have ability to Ctrl-C the build -CI_ENGINE_ARGS =3D \ - --rm \ - --interactive \ - --tty \ - --user "$(CI_UID)":"$(CI_GID)" \ - --workdir "$(CI_USER_HOME)" \ - --env CI_CONT_SRCDIR=3D"$(CI_CONT_SRCDIR)" \ - --env MESON_ARGS=3D"$(MESON_ARGS)" \ - --env NINJA_ARGS=3D"$(NINJA_ARGS)" \ - $(CI_PODMAN_ARGS) \ - $(CI_PWDB_MOUNTS) \ - $(CI_HOME_MOUNTS) \ - $(CI_SCRIPT_MOUNTS) \ - --volume $(CI_HOST_SRCDIR):$(CI_CONT_SRCDIR):z \ - --ulimit nofile=3D$(CI_ULIMIT_FILES):$(CI_ULIMIT_FILES) \ - --cap-add=3DSYS_PTRACE \ - $(NULL) - -ci-check-engine: - @echo -n "Checking if $(CI_ENGINE) is available..." && \ - $(CI_ENGINE) version 1>/dev/null && echo "yes" - -ci-prepare-tree: ci-check-engine - @test "$(CI_REUSE)" !=3D "1" && rm -rf $(CI_SCRATCHDIR) || : - @if ! test -d $(CI_SCRATCHDIR) ; then \ - mkdir -p $(CI_SCRATCHDIR); \ - cp /etc/passwd $(CI_SCRATCHDIR); \ - cp /etc/group $(CI_SCRATCHDIR); \ - mkdir -p $(CI_SCRATCHDIR)/home; \ - cp "$(CI_BUILD_SCRIPT)" $(CI_SCRATCHDIR)/build; \ - chmod +x "$(CI_SCRATCHDIR)/build"; \ - echo "Cloning $(CI_GIT_ROOT) to $(CI_HOST_SRCDIR)"; \ - git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT) $(CI_HOST_SRCDIR) || exit 1; \ - for mod in $$(git submodule | awk '{ print $$2 }' | sed -E 's,^../,,g') = ; \ - do \ - test -f $(CI_GIT_ROOT)/$$mod/.git || continue ; \ - echo "Cloning $(CI_GIT_ROOT)/$$mod to $(CI_HOST_SRCDIR)/$$mod"; \ - git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT)/$$mod $(CI_HOST_SRCDIR)/$$mod |= | exit 1; \ - done ; \ - fi - -ci-run-command@%: ci-prepare-tree - $(CI_ENGINE) run \ - $(CI_ENGINE_ARGS) \ - $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) \ - $(CI_COMMAND) - @test "$(CI_CLEAN)" =3D "1" && rm -rf $(CI_SCRATCHDIR) || : - -ci-shell@%: - $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"/bin/bash" - -ci-build@%: - $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build" - -ci-test@%: - $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_NINJA_ARGS=3Dtest - -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:" - @echo - @echo " ci-build@\$$IMAGE - run a default 'ninja' build" - @echo " ci-test@\$$IMAGE - run a 'ninja test'" - @echo " ci-shell@\$$IMAGE - run an interactive shell" - @echo " ci-help - show this help message" - @echo - @echo "Available make variables:" - @echo - @echo " CI_CLEAN=3D0 - do not delete '$(CI_SCRATCHDIR)' a= fter completion" - @echo " CI_REUSE=3D1 - re-use existing '$(CI_SCRATCHDIR)'= content" - @echo " CI_ENGINE=3Dauto - container engine to use (podman, d= ocker)" - @echo " CI_USER_LOGIN=3D - which user should run in the conta= iner (default is $$USER)" - @echo " CI_IMAGE_PREFIX=3D - override to prefer a locally built= image, (default is $(CI_IMAGE_PREFIX))" - @echo " CI_IMAGE_TAG=3D:latest - optionally use in conjunction with= 'CI_IMAGE_PREFIX'" - @echo " CI_MESON_ARGS=3D - extra arguments passed to meson" - @echo " CI_NINJA_ARGS=3D - extra arguments passed to ninja" - @echo --=20 2.41.0