From nobody Sat May 18 13:16:16 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=1692986157; cv=none; d=zohomail.com; s=zohoarc; b=lh4jFp5U9xwGGhAMn+PTSxjxGkPqgNbtZEsD0ynggYarlpBMa2o0azfrhmTEw0w/fQS0+d4Lx/vluhNdL+uesUsgP30vtZjvBQFU1zkZUH2M5KZsS4O2bT/dZL5DWQHUXQkWIW7ijyQeKlWAPDPUjNAAX1AfvhR8egpaOHIjczI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986157; 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=ymnwAE6A2NaZH/orZ224dFKJVVAZ7OM0rvonvdRthps=; b=HUHXJcB0L0YRixGwl3gxJ7TiuK4+c0p96q2/uXL3eDUPY7xMlfXDYfqZz15wd569UoO/uBxrQcTysf+aTHA4wPefR3lpwIVU26i0XF1TvYF77xFkwwPwWO0hgYEx9JTGWTSHp1c7tYYqyp+AJAlNFLBLe7EOJUZ8B665q4C8HdA= 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 1692986157183244.7617202960089; Fri, 25 Aug 2023 10:55:57 -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-178-zLDFbcY5NA-BEZjRe49W1w-1; Fri, 25 Aug 2023 13:55:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F2238D40CD; Fri, 25 Aug 2023 17:55: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 397281121320; Fri, 25 Aug 2023 17:55: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 0664B19465B3; Fri, 25 Aug 2023 17:55:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7164B19465A8 for ; Fri, 25 Aug 2023 17:55:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4FD6F4A9004; Fri, 25 Aug 2023 17:55:44 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DE04492C14; Fri, 25 Aug 2023 17:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986156; 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=ymnwAE6A2NaZH/orZ224dFKJVVAZ7OM0rvonvdRthps=; b=fEXVduNYrGkZ0L9sQ8GbvMWC/dcGPcNY4U6Le+jA1BF6qAc7N05uY4ugGqI0GYNFOR5EKs 4OgViqFVbh1z4z3/QU9cXmWQUrASkN31V2MwXH5mXO3FPlKxOksfSUTBsuwzTqXaKzmeK5 +MG3bJBOjZmmNVHJOH/ZtFUcxPyKPZg= X-MC-Unique: zLDFbcY5NA-BEZjRe49W1w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 01/33] ci: build.sh: Add variables from .gitlab-ci.yml Date: Fri, 25 Aug 2023 19:55:09 +0200 Message-ID: <660433a5a57bec7d741775f98f93d4b7e4bcce13.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986157700100004 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 --- ci/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index ed9b1f4473..d5586f457c 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -2,7 +2,12 @@ =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" +export VIR_TEST_VERBOSE=3D"1" +export VIR_TEST_DEBUG=3D"1" =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 18 13:16:16 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=1692986167; cv=none; d=zohomail.com; s=zohoarc; b=QtwPPvqbgVV9MyHcg2ZDy2EjT3Wie+rD1OLRr2GY/j9sUusWgxmNY/fQLyJeTEEviJUUYfKv10trU4wFZHakk1Qo+HW5CIACI+goiIoDWHXlDE8k/L2YG+3TMj9zRNXzw1eq0WsEaFOs8WzxkKX595eeK8QAkZVuy5Bi+SVfTPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986167; 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=dPbZpkZtF+2b57inkl1YNHrsMTMXhSa9dpQStPPe+zk=; b=mxYJ03dKj2BJdVo/x0R/nQNd+ygSGiIN8NwCnmen/H7g53ugL+TzwIiLm1uxmQjGuKeS0aoEKxOirB97x2C74PhMLUH7akqO+3JX0fTXMzp+rA/hpOWU/aHKdtp1iQcJJO9ordDKAVwpwLdTWzahUpfzs9mBSt80XU5z3Q3oVfU= 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 1692986167028129.185299896664; Fri, 25 Aug 2023 10:56: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-178-HdKiIdFKMwymA-AwNLlDJQ-1; Fri, 25 Aug 2023 13:55:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 308DA80D2CE; Fri, 25 Aug 2023 17:55: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 A052740C6F4E; Fri, 25 Aug 2023 17:55:46 +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 561A219465B2; Fri, 25 Aug 2023 17:55:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 67D0B19465A8 for ; Fri, 25 Aug 2023 17:55:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53CB54A9004; Fri, 25 Aug 2023 17:55:45 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6E13492C14; Fri, 25 Aug 2023 17:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986166; 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=dPbZpkZtF+2b57inkl1YNHrsMTMXhSa9dpQStPPe+zk=; b=DwPcwVdbI+jkE064X+XvyyL72WSGxvZHbQ8u7rVsypZseT9PeIBlS/Js7u77UzLSa4WS+A KtgwkD8S8KffFGEF/vO9s2l8t6lbkbHtgQHMSEK8W5NTD8UyYxASu9PwNmZvwaf0bo3lQw CBIp+mWUaSFyXHDJrSjdzLnE5LeCrCI= X-MC-Unique: HdKiIdFKMwymA-AwNLlDJQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 02/33] ci: build.sh: Add GIT_ROOT env helper variable Date: Fri, 25 Aug 2023 19:55:10 +0200 Message-ID: <0afc1c88997d595a33c36818bc7863e7bb69f87e.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986167747100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index d5586f457c..152c222244 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -9,6 +9,8 @@ export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" export VIR_TEST_VERBOSE=3D"1" export VIR_TEST_DEBUG=3D"1" =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 18 13:16:16 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=1692986156; cv=none; d=zohomail.com; s=zohoarc; b=JQP3G6H+oQ/jbyhqPIin1Qv2O2KDwe6ryFYMiJ8+hBsuCs2H6kMt4wRoJnVX9LNKHiFQflcTtSuadVvrFbpy8/vBn9YQGGF8v6XoDJhdUzJR52tK50ijzmJxGfe6RI3HS/VsOaRidHxKxwpcurYUiukGYY/7vZDkvEYNhpfzZ2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986156; 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=9fwwFm/SY1Z8JpU7P9L5Y20DmE1Q4NlbvhbUImiSZLw=; b=fVLgmNbjiYf5IKEUL5iGZJYJ3FwyuXqKIPAQsIZSLTSiSKpI4FuOIWfpqlFc7grWD/EuGgj7j8UsunFA/tfXeIsUIEeZZLGZc0AGczxF1KmPhV7kOSnz7iyxjvvTPLrRT9Rkil+pui/kAteeKDrzLyKAE9M7BI4cOQ8/T2Ld7dU= 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 1692986156664605.0866516564236; Fri, 25 Aug 2023 10:55:56 -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-307-pqQHpKKPMSmwKTvjOWFuHQ-1; Fri, 25 Aug 2023 13:55:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3000585571A; Fri, 25 Aug 2023 17:55: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 C997C6B2B6; Fri, 25 Aug 2023 17:55: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 8DEB519465B5; Fri, 25 Aug 2023 17:55:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8C3621946A4D for ; Fri, 25 Aug 2023 17:55:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7CBA24A9004; Fri, 25 Aug 2023 17:55:46 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE95F492C14; Fri, 25 Aug 2023 17:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986155; 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=9fwwFm/SY1Z8JpU7P9L5Y20DmE1Q4NlbvhbUImiSZLw=; b=ia9nhlQi6U9fLsQTLxRbCBmeurpHhFZd039qBrNd3xYFaWwlK0t/8u48VG912Ca0+35r/L TpiEM7W87A0QOArVwCUVHXfzBdmpuavr1431Xv9OxK3sh7W1GhbXnrGYimsE3GSrI62Ezv 7XIREsFdKtyM7bQMN1A/DxHc1JwgkLw= X-MC-Unique: pqQHpKKPMSmwKTvjOWFuHQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 03/33] ci: build.sh: Don't mention that MESON_ARGS are available via CLI Date: Fri, 25 Aug 2023 19:55:11 +0200 Message-ID: <87958ad4c064495ac1d297b53d1c6ca5cb1c6a42.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986157623100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 152c222244..82016ba29c 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -16,9 +16,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-configure-args=3D-Dopt1 -Dopt2` when run in a lo= cal -# containerized environment +# populated from a GitLab's job configuration =20 MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" =20 --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986156; cv=none; d=zohomail.com; s=zohoarc; b=nczEe4MjDJunhBj3QzALAkxb4cLBiaFHWJ+nEkrrnda7JME4tldri9SWMS8uCdpcyy4XOyQwgXWx+GZL0rHS2B36BYVT3W4sOEqcdumt2X4aIKIxpB/G/drac0Uiyqq7Q2CFJ35TTP3cL8UHcJBFuWH2pGfMlsEdq3AyguXLcZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986156; 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=wsTbJnhykbLBzZIwi5D0fCJ5edP2Twfd/1MSanstFhE=; b=d4wWNzk9NtKRcXrTsgd5PdiMQBnrBytWanGvJOZNjQ3B6ils0R4LJyELDD/NOvnxMu5MKfuKR+LZZW1anHraeRWCQvFeQH+IytlU0VFSxdfaYFcbdZkQQloIdjLaj0XLdPVy/hizA4XQz1tjEz52FXhF1BJ3LNkb8FZlSe1gw1E= 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 1692986156116953.4572490637037; Fri, 25 Aug 2023 10:55:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-196-Kw5tOdCRO-6HmgyfuQTL6Q-1; Fri, 25 Aug 2023 13:55:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0366A38149DD; Fri, 25 Aug 2023 17:55: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 E57901121319; Fri, 25 Aug 2023 17:55: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 C67CB19465B1; Fri, 25 Aug 2023 17:55:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9145F19465B7 for ; Fri, 25 Aug 2023 17:55:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 772444A9004; Fri, 25 Aug 2023 17:55:47 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBA4A40282C; Fri, 25 Aug 2023 17:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986155; 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=wsTbJnhykbLBzZIwi5D0fCJ5edP2Twfd/1MSanstFhE=; b=FMe822uJVOQNWKyDJNF1teXdT0UhXNWNHgGvFsHI7+VVp2cRzuVjqYnlCqPM56NLaiGTvi Oqho4hmzo+R0JC/D5lFwZGUd8F1cvaBYcoCaP0KWCGWmDuAwc4UpTzUVpf+0J1zSsBaY3t xLioodHwoGJuum0OE0vO/rlns+TOy5Y= X-MC-Unique: Kw5tOdCRO-6HmgyfuQTL6Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 04/33] ci: build.sh: Add a wrapper function over meson's setup Date: Fri, 25 Aug 2023 19:55:12 +0200 Message-ID: <38e7ce61754ceb1d6bc60a3f9aae43088b9d2538.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986157699100003 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 --- ci/build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 82016ba29c..02ff1a8388 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -24,3 +24,20 @@ meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS |= | \ (cat build/meson-logs/meson-log.txt && exit 1) =20 ninja -C build $NINJA_ARGS + +run_meson_setup() { + if [ -d "${GIT_ROOT}/build/meson-private" ]; then + return + fi + + local DUMP_ERR_CMD=3D"cat ${GIT_ROOT}/build/meson-logs/meson-log.txt" + local SETUP_CMD=3D"meson \ + setup \ + build \ + --werror \ + -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS" + + local CMD=3D"$SETUP_CMD || ($DUMP_ERR_CMD && exit 1)" + + run_cmd "$CMD" +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986157; cv=none; d=zohomail.com; s=zohoarc; b=ARBQPFO+Jx41T9OPKZREVRkYOdO7kffzOXO5j6DScxQDib66OiA+EvtmIgIqdfqqupTtx4wqg8s9q3nTctCqw+UBS2c2b+t/pQWg6cjvOXJQ5pZC9NCUT/SiawRL5K84zUiR70qltUWNc9GCiqXLnbryKFpbDF0sZmQ9vFBKgJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986157; 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=Ld3DyhO88Im0zgdaWbVjUlTI3T9g9rGqQHaGMGrUjyY=; b=U+I8Q/ENgbfR5kL5cDAvUwaYu8zruaScBcUHf9ZY5dTGTb0jeD93/nDztY/WDSdC5YgcmHYnqOPKvVgHmv9vOJUIU8Y17U6g89e2drd9WIiZjD/jLQo/fJAnGyy1TWfd0+HYloooFB5b5Ncz54zm4N6H35JG3RUxVEHU/PRFtoA= 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 1692986157944974.8298317081895; Fri, 25 Aug 2023 10:55:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-497-dHJ_D8pKPx6BListyXlONA-1; Fri, 25 Aug 2023 13:55:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78B723C11C7C; Fri, 25 Aug 2023 17:55: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 2C58740C200F; Fri, 25 Aug 2023 17:55:49 +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 06F021946A40; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4548719465A8 for ; Fri, 25 Aug 2023 17:55:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 333EC40282C; Fri, 25 Aug 2023 17:55:48 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id A37C1492C14; Fri, 25 Aug 2023 17:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986157; 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=Ld3DyhO88Im0zgdaWbVjUlTI3T9g9rGqQHaGMGrUjyY=; b=Vm3F6Rg3w8lM5PH5HEE6+nv0xk45rwS8Zd28Lkz8mvF+xuEE/QAZXf/Rp5Zl7tmXJ0BvMQ Jw3NaLi1yQJ1Q90jzMBn9t7LMww+KukEiKVdSddSKQ4QNUtxoCYDT0X3aPTL9VOI/FR4YV Pas3NujTnWNsd6Gs7SygyMV8b9VWLbE= X-MC-Unique: dHJ_D8pKPx6BListyXlONA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 05/33] ci: build.sh: Add a wrapper function executing 'shell' commands Date: Fri, 25 Aug 2023 19:55:13 +0200 Message-ID: <2624daa97a498b0ed2ee1dc84e76f810fd722a9a.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986159333100007 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 --- ci/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 02ff1a8388..d4fbf0ab37 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -25,6 +25,12 @@ meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS |= | \ =20 ninja -C build $NINJA_ARGS =20 +run_cmd() { + local CMD=3D"$(echo $CMD | tr -s ' ')" # truncate any additional spaces + + printf "\e[93m[RUN COMMAND]: '%s'\e[0m\n" "$CMD"; eval "$CMD" +} + run_meson_setup() { if [ -d "${GIT_ROOT}/build/meson-private" ]; then return --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986167; cv=none; d=zohomail.com; s=zohoarc; b=Frt1R/xNyVZ5Joa6y+oe+cAF/quz657hiasOyPem3PLLAzXQyKeoy9pc8+PRO3+fazWDaOnIF6JU4572Dt+Z+DmhSAXBOc0jLbeWWE9EWnfnJkW+WtVu2T1KS+J7exE1aE5kwnxnUAcsqckK6Wqyoy3N7GUuPsWPY3GsqYvwIYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986167; 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=ksEro63R6yvMAjqe/2QsEc1fUO4DmbCo3Xy15ZzFaCk=; b=e/qp/l+ddzdn9XrXOLAmYGVq8qvwPBKfBpBaw9Yj7utarfLZC/VvhMEz6v0hexcClrlizNib+AAwbNi9wIeiALKn9ar6E7WziqXdhJI/bdVirFXQJkpBzuBMbDiUFj2JDDMioM/EWL7K7kTennGlhUW7tI+sdV5Z1tJBpxv8kw8= 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 1692986167363790.4213637931826; Fri, 25 Aug 2023 10:56: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-106-Wj-QACZzMcCGDSBK7VkF6g-1; Fri, 25 Aug 2023 13:55:53 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE4491875842; Fri, 25 Aug 2023 17:55: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 6571F4A9004; Fri, 25 Aug 2023 17:55: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 3FA4719465B1; Fri, 25 Aug 2023 17:55:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0913C1946A41 for ; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EFCA84021B9; Fri, 25 Aug 2023 17:55:48 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7353C492C14; Fri, 25 Aug 2023 17:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986166; 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=ksEro63R6yvMAjqe/2QsEc1fUO4DmbCo3Xy15ZzFaCk=; b=es5H+5TT7t5HX65U5x/usyTifAXzi2aZYYJeSkDo2sx8uT5NvDSrshOwgxY/JfnVB0ldV8 iRt+0i8xagdN3/NsdkQi4t/thJBiW2+efww3DF7smdtk5qhKDwp0k64xpmkURgBKunqk0F H0bWj2/RIM0nvpuBusIDg1sag0GE+SE= X-MC-Unique: Wj-QACZzMcCGDSBK7VkF6g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 06/33] ci: build.sh: Add a wrapper function over the 'build' job Date: Fri, 25 Aug 2023 19:55:14 +0200 Message-ID: <5d2888ea4e8dce09fffa3b323f85597112d2a348.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1692986169443100005 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 --- ci/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index d4fbf0ab37..c2f54707ce 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -47,3 +47,10 @@ run_meson_setup() { =20 run_cmd "$CMD" } + +run_build() { + local CMD=3D"meson compile -C build $BUILD_ARGS" + + run_meson_setup + run_cmd "$CMD" +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986223; cv=none; d=zohomail.com; s=zohoarc; b=CaCjx/b8pMRVi2y3tXazszHzi6qLzk0pYhvXIUk/P1esa84ETHeiD+zWirSu7Ea+ZKvac+Wj/UMURTFwtxdJ7M0wtxSNQzmE/Qxz/jVIXzcX41xzbga+SvCB5DsdLU6AzZaGd+yuV4n2ROd2g7e+RevIz0rWZZxyAaDTETo1t30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986223; 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=yEXpMOvwQtLzCAfNII7N6voisFSDEgvylu5tj9QoKl0=; b=kLwLHfiS4PVH+n7FzkQkUZOTl8LDX189Vr9HrdG5u45t1S+G1+Y1nGE3cTupFHj06iHstrrhgLf0IQ+ZGsAL5jkyhcCyeqJ9RYPtgUaKOTW1MphJH5YHfa4iD8fooZ4baW9wD+NwtxLG3ZubLyt3b9KZ0YY+yWsHQi6o1s7cInQ= 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 1692986223981557.122279607272; Fri, 25 Aug 2023 10:57:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-481-JEQI1_HdPuSQHXy1GK1yww-1; Fri, 25 Aug 2023 13:55:55 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 746993C11C76; Fri, 25 Aug 2023 17:55:52 +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 5D2D340282C; Fri, 25 Aug 2023 17:55:52 +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 4049619465B8; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C6E7E19465A8 for ; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B4B274021B9; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3964C4A9004; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986223; 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=yEXpMOvwQtLzCAfNII7N6voisFSDEgvylu5tj9QoKl0=; b=Op6dLzeKoYadDmAoBq3uVLj63AW1ghM7Vo61EiwPgVf376J89K5a4XtEy4aOcE+nUq9dSx 68X11ZU+7qSLvXBWn1LZhScF/pvTqxnJ5qmb7Z0tDRedaGPXXxmDhkEU574FmCXtEWZagp OgvmhwlYUNCn68qTc9WYpUZqT7IytUg= X-MC-Unique: JEQI1_HdPuSQHXy1GK1yww-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 07/33] ci: build.sh: Add a helper function to create the dist tarball Date: Fri, 25 Aug 2023 19:55:15 +0200 Message-ID: <611ba120d82c7e1239dbae9f00eab39a1922a357.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1692986224264100001 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 --- ci/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index c2f54707ce..c56e45f51f 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -54,3 +54,15 @@ run_build() { run_meson_setup run_cmd "$CMD" } + +run_dist() { + local CMD=3D"meson dist -C build --no-tests" + + 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 "$CMD" +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986163; cv=none; d=zohomail.com; s=zohoarc; b=ITdHfTJscLnDDZ6gOQ2pmhtcNsV7hy5e7CWkx2cks4Xwc8rpZTOD9GwWeJMnvgHM7Ic3FrUmVoMqM0kTDF/zJOxjI0DQU3kxih4r6fPjM+MgLwvsItDuyBjIBvm61nS++JeNlVfNU57L7V9cCd6Hcu/vnHUION7IkVmdI4JlVxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986163; 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=Am49q4mOCTk7UKuVIOY1g+2DmJhwz8JivUlkKrrlfkk=; b=hbDLe5rP0vYXfx8P4OtnMx/U7NxJxMTVTqKM5KmKuymqxjQ3UoE7TmUdLLZgX5iX/vDNhNZSLmpNJTPgfY2UQUVP4jhLhsnM1DUyVQGH5Ma5Q2C3MIpiqSap+3XafYv8Bf7jB8tMvedTlhHUBwrP7f03nL1exvDAzlcHSKPfOJY= 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 1692986163722215.15228840561042; Fri, 25 Aug 2023 10:56:03 -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-588-4VIcGxmePOeb92cc54p2Tw-1; Fri, 25 Aug 2023 13:55:58 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 27AAC1875857; Fri, 25 Aug 2023 17:55: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 12357492C18; Fri, 25 Aug 2023 17:55:52 +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 7E3B719465BA; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8FA441946A42 for ; Fri, 25 Aug 2023 17:55:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7238A4A9005; Fri, 25 Aug 2023 17:55:50 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECF5A492C14; Fri, 25 Aug 2023 17:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986162; 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=Am49q4mOCTk7UKuVIOY1g+2DmJhwz8JivUlkKrrlfkk=; b=Upy2U9jpAQhFQpGeNhAO0Z8rldsJWuCwS3uKvlZfMjRlFhl4TprhROVWlnsuDJaO+2TZAv 7Ayi1r/qUB01kLVoLCUh6qwOsJVkvuxDvCHxKtUv2F5E3f5MMLFeOc5DOIQRkq0BkBqLlO I5IeveYez8FAqn2wmzOlRPj+p1GISdE= X-MC-Unique: 4VIcGxmePOeb92cc54p2Tw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 08/33] ci: build.sh: Add a wrapper function over the 'test' job Date: Fri, 25 Aug 2023 19:55:16 +0200 Message-ID: <90c4873945c17a8cbd27e44d4f1739a2eeff9186.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.9 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: 1692986165338100001 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 --- ci/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index c56e45f51f..ab471f2741 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -66,3 +66,10 @@ run_dist() { git update-index --refresh run_cmd "$CMD" } + +run_test() { + local CMD=3D"meson test -C build $TEST_ARGS" + + run_meson_setup + run_cmd "$CMD" +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986166; cv=none; d=zohomail.com; s=zohoarc; b=bH4peYVJSDSW+4DLY37DrqHV4+AKXHB5lN/Qrx065FLRSEkVoDa4vjfjSMJXKg+MLbB1MjH+y0ttcX9TqQufNtlBJGdNdkpFpJt1y0H5bFL67boFcMjdaXG2mPltToum8h47NwEfciv52KM6NeCizev0Jl2/LG2MZaWzCDkl2Rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986166; 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=YT4mWPnE8si5mGZ42wa4wwXM66AUwCyVqsErJlFMHbA=; b=MFkeTQXXP/lUPj/X2YgVlneI17lu3ORwc+1jXuxFHVBHE87EX8JqkFX1ZeB2d3jLYDlGWqqVus7+7A73PsTW2jOkO/WIi4AhfV0MhI2bATgbLM6fZ7j7+yUVn9Z9qiMrtb1zavRXMHy7iCGY8N5ENR4W+oCUFoqIqi25Evkv8GQ= 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 1692986166681426.26147068353066; Fri, 25 Aug 2023 10:56:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-217-zmmZkUb1NZiAxgZBPkzHjw-1; Fri, 25 Aug 2023 13:55: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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D47A3815F82; Fri, 25 Aug 2023 17:55: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 124A740C207D; Fri, 25 Aug 2023 17:55: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 B49A01946A40; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4FCC419465A8 for ; Fri, 25 Aug 2023 17:55:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2ED1C4A9004; Fri, 25 Aug 2023 17:55:51 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAE64492C14; Fri, 25 Aug 2023 17:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986165; 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=YT4mWPnE8si5mGZ42wa4wwXM66AUwCyVqsErJlFMHbA=; b=PzYlhFRiv6F0CPp7qA+3u8XYY3++PFV8sp8eJdqOjQCQvHb259+hgB+ipnu2kyIiQqI/k+ R5pCTLSN1FUnB8nNsW7V9kAZ9UdMhoEVbdhfcm/tY+iT8JIkdLTJO4Lo+id+MkC7iYs0oC CeGMqN0LqKLKAwQKAqSFRJAfEnOix+g= X-MC-Unique: zmmZkUb1NZiAxgZBPkzHjw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 09/33] ci: build.sh: Add a wrapper function over the 'codestyle' job Date: Fri, 25 Aug 2023 19:55:17 +0200 Message-ID: <747110e658117c60968567510b5c3cc56d4206fc.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986167942100003 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 --- ci/build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index ab471f2741..b2891a0c0f 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -73,3 +73,12 @@ run_test() { run_meson_setup run_cmd "$CMD" } + +run_codestyle() { + BUILD_ARGS=3D"libvirt-pot-dep" + TEST_ARGS=3D"--suite syntax-check --no-rebuild --print-errorlogs" + + run_meson_setup + run_build + run_test +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986172; cv=none; d=zohomail.com; s=zohoarc; b=mVZkzPPmF+0fWbxEeDpPGPpVAzx+zZhXd3tB0Lo+tieixwcL8CJXoxPe/593KzF/jDFckTfsW9DwztKzOqEhLrf8nuoy1b0CTJsqc0/Ogolq4v+3M9qqKkvPmKhYEugPZpXImSHDBAeIn3Qz6G+hJi2P+QgwfBtSIB4JKTk6NyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986172; 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=roN9U4GQZuQSWUtvzB/izJoybmFRh/2hCCjUlGRRu7I=; b=GPL6FFNj5Cqe9fIfUSSd0JkmsDFNXJCIeicJu3JR2uvcrg6+ce09mpBQEoOO4RcbKyVECtv2C70lWJEocX6lCO8tsVc8tJtVXc9XKwLEV4QSNL7+Me2V0EXiY16VTQwFyt7NBTUv5x4KuK0XcpK6J2h1uCARfDPHYSikD2oX8bo= 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 169298617199660.7781032355208; Fri, 25 Aug 2023 10:56:11 -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-218-UL4nwti9O2qre6OtQrDTyQ-1; Fri, 25 Aug 2023 13:55:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 10EDF85D094; Fri, 25 Aug 2023 17:55: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 F3C8C40C2073; Fri, 25 Aug 2023 17:55: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 EA01819465B1; Fri, 25 Aug 2023 17:55:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0672A19465A8 for ; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E03FA4A9004; Fri, 25 Aug 2023 17:55:51 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67CB2492C14; Fri, 25 Aug 2023 17:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986170; 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=roN9U4GQZuQSWUtvzB/izJoybmFRh/2hCCjUlGRRu7I=; b=dz4mSQ5pySVrTbIUrtSHmCOyI3hLwfVFTnZjuVA8if0Q176QpdXhITupNN8NCLW47PbFBz R65Vh8asp02CuSW0/9qLpZZe6UC1Rgj8hUcYG1KNHFJjlTMm3/HkcgSemi5mW/zNIy2yUw ck5Ag+KBvbOWp2S4qlBR7oywDX5tNLA= X-MC-Unique: UL4nwti9O2qre6OtQrDTyQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 10/33] ci: build.sh: Add a wrapper function over the 'potfile' job Date: Fri, 25 Aug 2023 19:55:18 +0200 Message-ID: <03a1df1be5d5cca7d59e8a6eee6ad023966176a5.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986173830100001 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 --- ci/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index b2891a0c0f..6990f2d171 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -82,3 +82,15 @@ 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_meson_setup + run_build +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986169; cv=none; d=zohomail.com; s=zohoarc; b=GF3hA6wBifGx515+DDJZWdsdCwvVR/cMkg/fBqYHjny8slxjFepu8ckWShG1Yud1E/jZ5ws10tkFzhnEbhG/80c8Lzc+KRqo/aO0lKJzXmQL2XrdV81RBICuk+cSmPYsa7efmgvE8grYGdgEHfs3dEA4wKkeCQ8osEY8RmDLrzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986169; 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=NbbO7dPi86Gum5Uvm3dSsvauWy5FeFtOMefXLUSYT48=; b=HYdYMp9HXO5RMp86/GxonPsBpM/PGHdWrv5ZXFWeTDZWBj8/kBjT3KeKkU7ayl/d7Bgmw9czpU+LLQoPt9EsfTBAK6IjuuTLPXXDpkfiE/wXZvpOtfwvt3u3p7nGhzyCdCz9DI86+jRTa1MgAMB6UyL6epi+d+AOeSKOt8Kqw54= 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 1692986169883159.96015736337563; Fri, 25 Aug 2023 10:56:09 -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-170-w6Yn364-MkK0GEHpKcXjOQ-1; Fri, 25 Aug 2023 13:55: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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 96E24104F0B8; Fri, 25 Aug 2023 17:55: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 7ED4B2166B26; Fri, 25 Aug 2023 17:55: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 745FD19465B3; Fri, 25 Aug 2023 17:55:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF97E1946A4D for ; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9C45F4A9005; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25077492C14; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986168; 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=NbbO7dPi86Gum5Uvm3dSsvauWy5FeFtOMefXLUSYT48=; b=EEHhGBJu3gRCh7dloRXgCjPTu9OATfiLhk5nEsGcuFW/bvBoFKwh5qkgFhXsaMpVqcUj5C iiC76Ox/abrnZcNsv0uQps2/tsElNjU5DyPT/T+RxC6l9vv+ki9IIbUWfFLECputaOsJ8X 6feoVnktVazvuP5G016jEibvONlwOLs= X-MC-Unique: w6Yn364-MkK0GEHpKcXjOQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 11/33] ci: build.sh: Add a wrapper function over the 'rpmbuild' job Date: Fri, 25 Aug 2023 19:55:19 +0200 Message-ID: <3ed60b014176cb14e6acd79efa6cf3490cf97c53.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986171449100009 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 --- ci/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 6990f2d171..30f4712e4b 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -94,3 +94,14 @@ run_potfile() { run_meson_setup run_build } + +run_rpmbuild() { + local CMD=3D"rpmbuild \ + --clean \ + --nodeps \ + --define "_without_mingw 1" \ + -ta build/meson-dist/libvirt-*.tar.xz" + + run_meson_setup + run_dist +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986181; cv=none; d=zohomail.com; s=zohoarc; b=hdcyUtGxi3dSdoXzpT0layCI3732DbNHLfOlDzlzLcDnVYUbz7Z2eMSCtF5SKCD8UTfOxxjaeI2nVFOtlKC1vn8Twxo2ebNgxHjZ4GoJ0LVQAt7F2s5rooc8y8UUiaaDIZMnkKc19VgtbWyOQyhCYGJaKEaa6GROIHHeFbW9HTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986181; 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=Xo1DCbH6iiEWjWH3yPd9nmdZJCQ5L1uNZuPpX90rnzw=; b=mnZ4aoAwQ1ogtKPJeqhgx9kg+nMU6ng0MC7j5acJ2ZAePUm5OhiReRxmwCXFk1g3LwK0b3r30DFvhoI67qKqinr7fKzYFWn1Yrv1aJPaY4OOiCo7DBvtXYZcebFZRyZCyduAL2jdiwJD/8sf2Iti4CvHz+DVKaL1W/3c+d1UNTY= 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 1692986180931458.76965884633523; Fri, 25 Aug 2023 10:56:20 -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-294-gA8lVEnIP8iNCmGO3NZqng-1; Fri, 25 Aug 2023 13:56:12 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C11E185A791; Fri, 25 Aug 2023 17:55:56 +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 89713492C14; Fri, 25 Aug 2023 17:55:56 +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 7D8B419465B8; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6740C19465A8 for ; Fri, 25 Aug 2023 17:55:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 59D0D4021B9; Fri, 25 Aug 2023 17:55:53 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6816403166; Fri, 25 Aug 2023 17:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986178; 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=Xo1DCbH6iiEWjWH3yPd9nmdZJCQ5L1uNZuPpX90rnzw=; b=J2PM6PBlk58RQwedmNazvjV34xKwd1wmwI+JdMm2c2AgwC2g9E4lfzaboncZAezNNcfu6u Do203mBClwlJhlW1vyewRhZOzMCKt2vFbjljQSuTfZE5CRihAxUzdbpPSQwYsczAe/t/Mg fT4E5nDNQjlizEEXhvgSslmlUTVg9P8= X-MC-Unique: gA8lVEnIP8iNCmGO3NZqng-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 12/33] ci: build.sh: Add a wrapper function over the 'website' job Date: Fri, 25 Aug 2023 19:55:20 +0200 Message-ID: <786f5c39ee5d7a0f20055980d26f734fcef4737e.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.9 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: 1692986181926100007 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 --- ci/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 30f4712e4b..6673ec6b18 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -105,3 +105,11 @@ run_rpmbuild() { run_meson_setup run_dist } + +run_website_build() { + export DESTDIR=3D"$(pwd)/install" + BUILD_ARGS=3D"install-web" + + run_meson_setup + run_build +} --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986173; cv=none; d=zohomail.com; s=zohoarc; b=H8awHU+5XgNpuuQWwwEnqTBL8CC1fxs/RZlFoWkyUjgM1KD5FoWIZm63hngMQaq7foUE93dDEWurEFov2VukcqyK7133KjTabc6hL/rdGZeQc1dtewBZqogzmBn5mYHgcRGVQj9ieKc4DqIRBEivrHVdm821UCxwuAzCkjXVuaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986173; 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=JpUqaV0PaRldyhUxtYnvPxcbALZQ3s1fcekakM6kH9A=; b=cUkYkxGLc+zTzFQ7Z8sDb9Op4eSHJ4Xd/SM67je/RNEDnSEHz2g7rAn07k64QtJBR9QAK7Y4yKnEADw+dOgNoS8S5y/SWUMQdyGKj70fALG81PNtCa/tlDfs042J00Hhd9ZniTXntxIfjbwhJHg3k2Sp8GdyBYtlE1pQZUTk8hs= 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 1692986173327818.6614781927088; Fri, 25 Aug 2023 10:56:13 -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-456-nW0Xs7SvO5KNDH1qPxRRaQ-1; Fri, 25 Aug 2023 13:56:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71C15185A792; Fri, 25 Aug 2023 17:55: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 5EA681121319; Fri, 25 Aug 2023 17:55: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 3A51619465B3; Fri, 25 Aug 2023 17:55:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3560E19465BD for ; Fri, 25 Aug 2023 17:55:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 14B544021B9; Fri, 25 Aug 2023 17:55:54 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 923FD492C14; Fri, 25 Aug 2023 17:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986172; 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=JpUqaV0PaRldyhUxtYnvPxcbALZQ3s1fcekakM6kH9A=; b=EIkpbHVKIQNbQ0W/e6YeDJQvhcpVo01gTPBbNkYsemHqlYr6R8lKa5BahbnBJ6tvH/atA5 2cUbxfl/CKFBm3Yzz6MuLV9YFEWKN1mKGZiDleSdaPQZhXgv/Rb1U78itcBuI1K9vaz/zj wuvDYYn0OHN06UM3OkAFTDmD7WJAYWs= X-MC-Unique: nW0Xs7SvO5KNDH1qPxRRaQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 13/33] ci: build.sh: Drop changing working directory to CI_CONT_DIR Date: Fri, 25 Aug 2023 19:55:21 +0200 Message-ID: <2e555ee04ba27c432cb85e14b43412db5a93763b.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986173966100003 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 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 6673ec6b18..133952f706 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 18 13:16:16 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=1692986168; cv=none; d=zohomail.com; s=zohoarc; b=NqgUaGzL4Os42hF2vrK8YmNkud/YoHG8FYjYP0UJqSOhDX11JZjL9sMLEnqZc/GpDFup7husiXgvCJLrcrSzUrUN0HiOC7DH4TfxrYWR3IFA2HAqSD6IQRRxWAnIPOMQfgAebM/bnKnQnIEn5fibgndvB4T5xmohee6WtmOtZ7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986168; 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=RR/MVYsNalPrFaUZvs6h3jmCMsik040NZ6++zi0LL40=; b=mlGjplHSEwf3SWX+f86RJwUC7ULZ/3m8msXxmBG5cfjl72w0nfr09bZJwVK1SxDr1x4/qiqurCrIfauORCJeLNFZIVVQdPo30slfUdkjGvyjUWr4MaJcQggFdgtlULuqDLoLBYppaan4EDCILEL5baCgTS0LOjkM8zfcwFQy9OA= 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 1692986168794777.5806353425594; Fri, 25 Aug 2023 10:56:08 -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-694-8Wi-qMO_PZidhrCD6jNlMA-1; Fri, 25 Aug 2023 13:56:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBCED823D7F; Fri, 25 Aug 2023 17:55:57 +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 D71971121319; Fri, 25 Aug 2023 17:55:57 +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 BFD6219465B2; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 01C8419465A8 for ; Fri, 25 Aug 2023 17:55:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C57A54021B9; Fri, 25 Aug 2023 17:55:54 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DAB2492C14; Fri, 25 Aug 2023 17:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986167; 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=RR/MVYsNalPrFaUZvs6h3jmCMsik040NZ6++zi0LL40=; b=EfFOgJqCa8+9X/mYUWlwvRoN6x1YZyKEU2Gl8F+5qqt7qVDm2D2KK5r0x8HczY1i+gZggf KW6+StOjVsd0phCqLpH5+6pVi1Zrom673Lv0Z1ve9is9VweEZWUlzxa95CtOuwTPuij4J+ xE8z4q0iKsU8mo1OT4JjmdO8EcmxbWo= X-MC-Unique: 8Wi-qMO_PZidhrCD6jNlMA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 14/33] ci: build.sh: Drop direct invocation of meson/ninja commands Date: Fri, 25 Aug 2023 19:55:22 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986169766100007 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 --- ci/build.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 133952f706..b075c49af3 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -18,11 +18,6 @@ GIT_ROOT=3D"$(git rev-parse --show-toplevel)" =20 MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS || \ -(cat build/meson-logs/meson-log.txt && exit 1) - -ninja -C build $NINJA_ARGS - run_cmd() { local CMD=3D"$(echo $CMD | tr -s ' ')" # truncate any additional spaces =20 --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986179; cv=none; d=zohomail.com; s=zohoarc; b=TPsVwf1FXoFofhXRAjn3LCo05HtBnprf8TyjFcD5BIxLI9yOxob78DBHQuQ8xGDc3YU+0VTZ9XFYaodu2tvnU9W0vppDlwaHZvvjm+9o7ZUxl7aZNhoD9Cb35kFBJIeuj27tyu74L8apDaaBcu2UelfokoLxpgNVIjFVSXMROyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986179; 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=Pdr0yNOw2bul3Zbt0N5MYu4tczsTgB9jA4sTc6+dKj8=; b=NSJoqvukOvyRct0yngunBrrQGZ6wNRmMT48Dekvqbndy30coXV0Byr/LWS4+rwBE6qDJOyKjvTJUtxe76IBTpNN4GR94oniOgeqV5E35KKAVetjQLHaFAEcc1P1iqc/plnfKjSwhz6b8XNvyvXuyYJacwV3KdrYmNmutGWfniKQ= 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 16929861794637.3707856889005825; Fri, 25 Aug 2023 10:56:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-177-oQb5EzNNO4OeCamghA2JdQ-1; Fri, 25 Aug 2023 13:56:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9F7D381AE71; Fri, 25 Aug 2023 17:55:56 +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 D389D40C207D; Fri, 25 Aug 2023 17:55:56 +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 C7F3B19465B3; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9EDC519465B1 for ; Fri, 25 Aug 2023 17:55:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 81E884021B9; Fri, 25 Aug 2023 17:55:55 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A09E40282C; Fri, 25 Aug 2023 17:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986178; 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=Pdr0yNOw2bul3Zbt0N5MYu4tczsTgB9jA4sTc6+dKj8=; b=Vv7Z377uoQM2L7g3DE6FNWkaPiplWkxZRnv38gOTNltT3RXHwKLoFJZKopsPg3kXFCpt4j 84ErHCBrqD+BKG/U3ZRxm8w2gkq4TDszNcyMXVrSZqfQJSCt5xTZxlFItzDajNQ20Ni12N ZYCAn4uZZFa7zIglhHBQBmMJLqnJ/vA= X-MC-Unique: oQb5EzNNO4OeCamghA2JdQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 15/33] ci: build.sh: Drop MESON_ARGS definition from global level Date: Fri, 25 Aug 2023 19:55:23 +0200 Message-ID: <95adc148d5ba198fb5e328a11010d134339f4aeb.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986181488100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index b075c49af3..5eef53f8d1 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -8,16 +8,6 @@ export VIR_TEST_VERBOSE=3D"1" export VIR_TEST_DEBUG=3D"1" =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() { local CMD=3D"$(echo $CMD | tr -s ' ')" # truncate any additional spaces =20 --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986225; cv=none; d=zohomail.com; s=zohoarc; b=c8MDc9yZDlYEy7c3K5ki98UNS8b3GWvUFz7L/Maq9c4kABWZcS2jHIgSy1tYsF89dE8p/H5HEQ/56lIXUx7+i5j12TXyUFYTTSgRQBYOQTQnZjIZlRgVSuXzuyu/Q4kTvQH6Li3GhDfCeOLc9FV9qyd5qOsZ0w+FuUWwCOIGtk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986225; 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=Ir+JiVPb7mKMN1ARNcx3O09DYXjc/UvxYqmD8IpzpfM=; b=IVBvAVBNHVgiH6CFBvXjWV1h34RUBVmOwljM9jsICTjg83IP1CkuKs9Xm/Afr3IMgLKdWz8w5xXMSHHb4ayDhzpC5gPMTvNpD2zVBD6pGtMj+OCPdTwhk8T3j4OJEvBrNaxJB+axCvrxHJscAlhE6NlqYoFzJMU3cKQRM4VDIeI= 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 1692986225374277.0638728277261; Fri, 25 Aug 2023 10:57:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-513-dVtsvj9yMF-DHLGcqtJ7Ww-1; Fri, 25 Aug 2023 13:56:06 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 53CFC381BEAF; Fri, 25 Aug 2023 17:55:57 +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 3B2CA4021B9; Fri, 25 Aug 2023 17:55:57 +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 0B53A19466DF; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 43C9C1946A42 for ; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3E60A4021B9; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB4FC492C14; Fri, 25 Aug 2023 17:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986224; 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=Ir+JiVPb7mKMN1ARNcx3O09DYXjc/UvxYqmD8IpzpfM=; b=LoEM3QkX7pMMv+7sDiP2En/HFb9IFnQrpjHxHWCwqkAD27+RCG+0PwXXI+9QGBJUvotIDz /8VSumT2OLlbDn0C4Yozb8a0x3e+0OOcEW5UN1Yqw6dszFmALghIphnVgMOHjSe9FHUmr6 E7BFLi1V48YUCTWSh7OgvxrhF85SdfA= X-MC-Unique: dVtsvj9yMF-DHLGcqtJ7Ww-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 16/33] gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection Date: Fri, 25 Aug 2023 19:55:24 +0200 Message-ID: <794a1fb88cb1f3fdafad5c965b98b1237e61d46b.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1692986225699100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .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 18 13:16:16 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=1692986179; cv=none; d=zohomail.com; s=zohoarc; b=WKddchsK8M5a1tuel0mVssxihvrxPasD1ycCODv0FW13mwsIwZ2BRhQsZV4PVwAd6uc8gc5OeTD5+LBfCnsaNresAdnpMnBmt4UAJu19ifFwamyFLkKaE510vTLUjgOpxs4Cko1OA/G5AEgRhum/UcwR6QevZwXXY1wjxfMWEbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986179; 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=vAqy2I2hIdj8gdQCYeFGa/Lq7zxAeJJb0ekaQ6ZcQ/8=; b=D6veFjJMydKUKtEcFpNfO3/Pyo36LXERpWIg4K2X2S5w8sDtoX+0TZiYWJb9nSWQrq6k/tdHsRjawEqZ5esBJ6EFjKjUYg9Kl1hrHr5bdi/bts1Y2pI2gH7mYrxzuqeGleQnD9RDxiG7Ll339ZQVFI4EJP6d+kuDk5spA/SbJZo= 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 1692986179279782.7877825065283; Fri, 25 Aug 2023 10:56:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-563-PZVqe5LAPFGuEI6rRqVaHA-1; Fri, 25 Aug 2023 13:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3CE863C13511; Fri, 25 Aug 2023 17:56: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 247134A9004; Fri, 25 Aug 2023 17:56: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 042D419465A8; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0B02B19465BD for ; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EF6FB4021B9; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77631492C14; Fri, 25 Aug 2023 17:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986178; 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=vAqy2I2hIdj8gdQCYeFGa/Lq7zxAeJJb0ekaQ6ZcQ/8=; b=WCd7rC48W1xPr7ljFHyeatfvlhKFGS4HrKW8CFl+4r1lggEn3p45Ay6mISILLS8xJWvnCr OVMg+7RgvXwHJER7DXoqK1Rv+f+ZQ7fOvqOiWsI5k+hmP2dJP6dHNUxCMiqJ2TQvYEYAr8 u0hdAsBqupQ6QoFgJzsohuUT1K82oaI= X-MC-Unique: PZVqe5LAPFGuEI6rRqVaHA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 17/33] .gitlab-ci.yml: Convert the native build job to the build.sh usage Date: Fri, 25 Aug 2023 19:55:25 +0200 Message-ID: <4cfe0cd272b48c1741ed3207eb7c475f54a20663.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1692986181429100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c6af8f8b3..6a8115037d 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/build.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 18 13:16:16 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=1692986238; cv=none; d=zohomail.com; s=zohoarc; b=czNr+JGNxvSrjO/2buQOFud0cGUhSrWZJ7xfLm8XAFhsz4TpnvOv+mAyS6XGhTxaOZIS65CdwErcnDegi58YupIZzLZU+0zrPyYocG1QMw6QiPlp5yAVZNLBuccZzEgGRjjWKf9fJ4sv/FMwpMr6rHPzR/sTU7XiRymGCpOoyD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986238; 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=oo9R7jDwZhnrfesA98o6w4Od9cIOPvBvvZVtlvuAeFU=; b=Jh2id8juBdiLrsRTUhucCfu5cFpFeI1v2jx1ySpnUQXMOKhP1cypMp3jGBnZoQyaSZAo2N8HvAyU99oUYrgc2W1i36rQIOUDZIRWFl33LLB6OnlzJu54qdWmqs2mOkFqPmtGnwXUpLXebyzFseclnMJEIG1Q9h3VqOEOe6lgX4k= 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 1692986238721210.63146469742492; Fri, 25 Aug 2023 10:57:18 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-650--cftC0eFMROFHD_v3Gj2rw-1; Fri, 25 Aug 2023 13:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D1EE3C13944; Fri, 25 Aug 2023 17:56: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 2A7F31121339; Fri, 25 Aug 2023 17:56: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 A75CD1946A63; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B6A3F19465A8 for ; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AB9B94A9004; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34564492C14; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986237; 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=oo9R7jDwZhnrfesA98o6w4Od9cIOPvBvvZVtlvuAeFU=; b=Fu4SrxSjj2Uol1UEqD/v63rSQsD7WqwRL6kvs7R1bfpL6wzC9x3lSVujDAgAYlT4CdKpxi jk0HyADFZn0zINfqPWZTDOPBUTQjtrZMg5x+5NQNvDFlzSUwajYGH60gbYsUZqJNrEIXIp NdBzWtwV8szqL0UF5Lh8EWC3pbrGJrE= X-MC-Unique: -cftC0eFMROFHD_v3Gj2rw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 18/33] .gitlab-ci.yml: Convert the cross build job to the build.sh usage Date: Fri, 25 Aug 2023 19:55:26 +0200 Message-ID: <1d2e1de734d7a870faa68e0fc07bb5cdfab07817.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986240292100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a8115037d..b59e56941c 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/build.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 18 13:16:16 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=1692986223; cv=none; d=zohomail.com; s=zohoarc; b=bb4vcGn56KK3ylHcMaM0BP+v915Hbbv0h+iG3IvxgBEjul+vOPDbyNvZ7D98mN+jLhU0fbLEyYOxa6N6zEHbbYRZMCLB8YLLtlkF3n7wUjhiP1Y7RCEvHI2Jh0TRf1rLWEP1jXBTAwib+AI9I+SlszowcScrvmEYMsuXONb1c1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986223; 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=qepuq+9HQKaYJ8elu9t0qD5Zbc3Mw04T3YfGtOUTLSA=; b=UWbSt/EDPAdh3HRvwsK/LTGhImfUUgls+78uu82lKo6qNU3LBg3tsvBj36TGPrOIDUzgtUQ7Uk0y7Im5nPP474yOEBz3LWu5SFBZVF+W1oXGlThS7KYO4MQAgIyp0Bvt8spw+vZl6LKiS03Zkqcm2Es9RDVh63sLcuvsFm3zkkM= 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 1692986223507907.0536779170982; Fri, 25 Aug 2023 10:57:03 -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-595-1s5i45b-OCOAj3SD8CSHug-1; Fri, 25 Aug 2023 13:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BEA718D40A8; Fri, 25 Aug 2023 17:56: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 AAE056B2B6; Fri, 25 Aug 2023 17:56: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 3DD6019466DF; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 74C1E19465B2 for ; Fri, 25 Aug 2023 17:55:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6732440282C; Fri, 25 Aug 2023 17:55:58 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4846492C14; Fri, 25 Aug 2023 17:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986222; 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=qepuq+9HQKaYJ8elu9t0qD5Zbc3Mw04T3YfGtOUTLSA=; b=J13jbdwrbI9UoLXueiUjryssm0GZBS5LTVkwH8Fm+YaypasvnJUffwYvwT6tMpt7I38aqX SI5Lx6+PAsEcEAuX+HGq/eTbWx0KDUCNObfRmrnxvNlOXETJej2JuKoindwoBGvwtSedmK FvyR/c/zXG7hB3z2e4gLbSUrS93CoL4= X-MC-Unique: 1s5i45b-OCOAj3SD8CSHug-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 19/33] .gitlab-ci.yml: Convert the website build job to the build.sh usage Date: Fri, 25 Aug 2023 19:55:27 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986225702100004 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b59e56941c..0450c1f6ad 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/build.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 18 13:16:16 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=1692986178; cv=none; d=zohomail.com; s=zohoarc; b=WRdAnmzptLN0IugfW2MhxVkyPsgyfWM+IDEs3Cm4qQP7zM4+/PNnNE6/2z2Z8Wd2jVEdXGzHeKbcHNNUOLdXM942AhhdMK0fTXp/DhHQUWGdRE8V2v7Mn2oFYBvGJvvp7DvQ6XMJSIovqtQBetm30H8Fi8omfjgWc7Wt8QvbcD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986178; 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+i5LpXDgo5zdqQweP5/C0FsQGlWJDHyEufuTUT9vTs=; b=VMIyRjYBTk2QqkllJMVB0f9YtHr6UvBYRHHHbw34r94VRIHpu3N6n8MU+B/95hrXtTlHdrP68FrzaBx+Egs9ATlOfiBaVQwWJg0JAeoqiCgpFC490Z4fY7ZjSWPfdbXUkLcTGZYLuaWaG4s0fcm5Rnh9QBUmVrkVijO4DBXh/zY= 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 1692986178393815.0041331602271; Fri, 25 Aug 2023 10:56:18 -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-625-FTOJ-9xkNI6-_XLa1UGFDg-1; Fri, 25 Aug 2023 13:56:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0CDC610504AD; Fri, 25 Aug 2023 17:56: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 DACBF1121320; Fri, 25 Aug 2023 17:56: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 753B41946A4E; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3AF9719465A8 for ; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 26037492C14; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2DD64A9004; Fri, 25 Aug 2023 17:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986177; 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+i5LpXDgo5zdqQweP5/C0FsQGlWJDHyEufuTUT9vTs=; b=ei5lrU1WBHEPbLUttFgNzh8+2Rk3jNpqYC949DxPq8RxIHEm/lIp2kt7/xu8j8PBRQWr6L V4HiZg9ckgcXD9pBRYcP52ayN3soD+r/neHUsPkoDHZvud3HmczK76w2g6hroQo2jnlXBe 0XgUL/XdQSYCGkcnL9Z6Yfr65tW8U6Y= X-MC-Unique: FTOJ-9xkNI6-_XLa1UGFDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 20/33] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage Date: Fri, 25 Aug 2023 19:55:28 +0200 Message-ID: <2c143db00e9a4302399b6aada0e3afe0ae58fa34.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692986179991100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0450c1f6ad..0ed6504dc6 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/build.sh + - run_codestyle =20 codestyle_prebuilt_env: extends: --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986186; cv=none; d=zohomail.com; s=zohoarc; b=aglyM6DgHgcbHa8gsD5R5iL/1cZiIbWVyK7Yx3vweE9gHnZ9lXcRfiAPf87ktHUoeJbZbIQ59iZhGNYgpKbtMLsWRMDkOHNu+Sn/29s6lMOxemaCJ8pZVkhOU6dZMhy7qU4IuXtVc7agVUbPMAMhtyyn0tVU19W+asHCVCtZ2Ng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986186; 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=JzMUblglknZKpFdaMTkYIkAqneFOFxjpPxWi9/wY2rw=; b=C32QRNUkhn/R3aE/c+RCGzfLO8wEVbGaLikVTliTG71M4YoVbbtoNSy5GpwS8AA9RJpvMR8JxlZLLY8/SqHKuXMoD9qc2WDoepu8MKlzJnMPoG7kpxBV8i6SUF1bQbVWGZB7Dvf+zE+PDcjBkUxpKA2LUBXuIF9aCCKoVqNHzS0= 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 1692986186150648.0989614455381; Fri, 25 Aug 2023 10:56:26 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-663-_UTvtvpXNbqVoPwGACcJeA-1; Fri, 25 Aug 2023 13:56:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0DA3138210A9; Fri, 25 Aug 2023 17:56:02 +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 ED44C40C6F4E; Fri, 25 Aug 2023 17:56: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 DDF0419465B5; Fri, 25 Aug 2023 17:56:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E554519465A8 for ; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D626B4A9004; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EC4E492C14; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986185; 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=JzMUblglknZKpFdaMTkYIkAqneFOFxjpPxWi9/wY2rw=; b=expnosLXs/fomiNuaDOihkUIr50cEhG67Jy9/IKgiIzDfLnxaUSBGostZYsmQc8BrrpmeC kPxBalVCFikkZSJcnJDd6Dqrh8UNmt3tjphleOgl6k/m9r8HeA8ZnvGUAtAJtVH9Y1dsmI g0L7S1eT4/x/Cf0WI1ISg+6w0GhrL1g= X-MC-Unique: _UTvtvpXNbqVoPwGACcJeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 21/33] .gitlab-ci.yml: Convert the potfile job to the build.sh usage Date: Fri, 25 Aug 2023 19:55:29 +0200 Message-ID: <2cb27da6b322c1481dfdd63725ffb97a798943f2.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986187598100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ed6504dc6..3efde7098a 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/build.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 18 13:16:16 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=1692986226; cv=none; d=zohomail.com; s=zohoarc; b=e6en+Pzo9eN3VmaMLR/a/9FPn50cqfckRKTx5kbSl5DJEHPublR8LshMNqOKXK7KQU0f6UI3Ri8eYmQNAzg+XiOMe9k1MXpwZXtTJNWZjmvVrMzUqmHSyWvxnx9lwzH0hNOYDh0jAL64gSwBVm9LwxtkWjaGogo0nCf8i7MZ91w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986226; 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=VqZwAnhPWKIxw54EsyblTng0jq8ScugXgw3E93mFdJc=; b=f811a7CY6NwGuCsBw96/7wSjBVIgwnq6fMOE9G+VUNAowI4dt+UnKAu7fIw5hM/koDIaSoKmb6qIP2FTTasn7Zm4AaESFcLuHTXNl7p10Txb6y3kkSa9J6FgT8i0XBydEmzEp/ZcRHpvcDHwIPem+8NRE3zP6JKljSjdjNEd84E= 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 1692986226088257.96574619917646; Fri, 25 Aug 2023 10:57: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-21-7Ga_jyR6MlS65IzC5EpeVg-1; Fri, 25 Aug 2023 13:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 949E9805585; Fri, 25 Aug 2023 17:56:02 +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 7BB7F2166B28; Fri, 25 Aug 2023 17:56:02 +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 397261946A4D; Fri, 25 Aug 2023 17:56:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A1EA119465B8 for ; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9396D403166; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A885492C14; Fri, 25 Aug 2023 17:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986225; 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=VqZwAnhPWKIxw54EsyblTng0jq8ScugXgw3E93mFdJc=; b=KHOzmNHV6M7XWUNjUkEvCrmJchJHiFELj4Xs8jBgh4oKaJT8wus1vVoomkqYir6TuGlO/N XIBkLWwdym3w51NCFfcsGBNj909O4IA/Wpj4m3qX5YSotIQJ8ZBDfSRGmLcgN2ItK7xkBc wj4GyerzoExQ2Iv7iBAhDDWtBRLmUBQ= X-MC-Unique: 7Ga_jyR6MlS65IzC5EpeVg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 22/33] ci: helper: Drop _lcitool_get_targets method Date: Fri, 25 Aug 2023 19:55:30 +0200 Message-ID: <3e2412576d6f7423e6944c0e8ee3ee9fcd34199a.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986227780100011 Content-Type: text/plain; charset="utf-8"; x-default="true" This method unused anywhere, so drop it. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 18 13:16:16 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=1692986231; cv=none; d=zohomail.com; s=zohoarc; b=YK7/EfRyAZ7FZsNBU9gPUHVI9S7sOksi0m9Jj+reasJiBVACjt/sUMCTTGIx8YFjo/e3I2/eyQ+AHIqaTAXzQO5JezTWxkmuNWhsBExfmG8VHmnlYVTgk9odEyG71Z4Tv0rtGP96lLYRKzu2lt5YY8IwJ0TVoplzb36zEbc1Gbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986231; 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=kBiDOByE1sivqVoupy3hofc2EanFLCUvGTpW+TH+puc=; b=Z25/dLjok35mG/357R4c2xeCVY1YB0bUXTP+Qsjccr0jpXFKSVTm6nmBIIvr06TiF+Eu4PSDVRT7VwC7il18nmtD0eRTxD9Ma0mjVJfOY/oT0fcbGcThi9PPadraVNHHHwrkVEJosXh56djYeGgx3J5TDGrI4FLf1tTvttLF/80= 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 1692986231650596.1062773571891; Fri, 25 Aug 2023 10:57:11 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-191-vLXb8kpvP_GM0FbjWscc4Q-1; Fri, 25 Aug 2023 13:56:18 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E695F3C14805; Fri, 25 Aug 2023 17:56: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 CC2104021B9; Fri, 25 Aug 2023 17:56: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 9CCAD19465B8; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5EAB519465A8 for ; Fri, 25 Aug 2023 17:56:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5459F40F01D; Fri, 25 Aug 2023 17:56:01 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCCC440282C; Fri, 25 Aug 2023 17:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986230; 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=kBiDOByE1sivqVoupy3hofc2EanFLCUvGTpW+TH+puc=; b=fcXfhFTCz1ovwueODqSIHPM7Z/s3wyKUjgDS0uEG7pEMb+bSphS4lHmMy0IvX4MR1QzJdP dQeq8DbOUnXnxF4hNwS/xiiA58Obt3192oXg8ZSyC/JwW3X8fzKWLDKpMKsTdNHOX4X6ua 8bSYiyGGEl7egpOf8ZZgJ0cJQeB7+po= X-MC-Unique: vLXb8kpvP_GM0FbjWscc4Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 23/33] ci: helper: Don't make ':' literal a static part of the image tag Date: Fri, 25 Aug 2023 19:55:31 +0200 Message-ID: <4350fb4937de62b5bc7caae1a749e3504cf5954d.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1692986232245100003 Content-Type: text/plain; charset="utf-8"; x-default="true" ':' 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 --- 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 18 13:16:16 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=1692986188; cv=none; d=zohomail.com; s=zohoarc; b=Ev35S3SbnX01x12YKCpu0iADKiO5ruLKylIX+eyg6EJ43Sb7T0wqI7cnxfuFhALvqvmUSTTvpGUvTUac4UmXvQkxOWKBQLKA7ZiP0E15/Cn0Kw4Sc3ew67Tx0SI9IBoSXON7eJLq4gcu/r2lkGoscaoqKVCA+Qu0w+eHHvq2O7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986188; 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=NNJFykQeI/MuRmIwcutebbt9nNOaX/RGECTFTUdQA3I=; b=lW9nhngEit5oazPBGYbVqilIQBv9fm2LrrD5gtIbzDFPcPGBNzbi/5tnWVibzoF/xSmWRY5agii6pQOorJe0myGkpcE59R8KG3wxpXJTH89cX9ddNRtivxiTRaEns4tRfpVm2RzJyWKpL2LKw7aDPMRwZCyzFGazrxj8HmIh1H8= 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 1692986188852947.9733583493753; Fri, 25 Aug 2023 10:56:28 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-86-oHpIbTljNeaLf4Hs2JKV4A-1; Fri, 25 Aug 2023 13:56:16 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87CBF2812955; Fri, 25 Aug 2023 17:56: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 731D540C2073; Fri, 25 Aug 2023 17:56: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 4F72319465BD; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3042919465B7 for ; Fri, 25 Aug 2023 17:56:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1161940282C; Fri, 25 Aug 2023 17:56:02 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DAB8492C14; Fri, 25 Aug 2023 17:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986187; 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=NNJFykQeI/MuRmIwcutebbt9nNOaX/RGECTFTUdQA3I=; b=e5lq7j6qlg2Fwjta5oW+A4nucbqAfB/Jl9Nelrv4waW4btpvx0q0nomQwXscojVxdOu+01 jrvN9q4603dd+4lC7l07JTekHYblC1F36P68BB+kCyOFahcWyvy7Kc6eIBiJlBYNGMp8lK LAxJfb2Cl+HFa8AGf7bwSTx9BkKkgcI= X-MC-Unique: oHpIbTljNeaLf4Hs2JKV4A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 24/33] ci: helper: Add --lcitool-path CLI option Date: Fri, 25 Aug 2023 19:55:32 +0200 Message-ID: <7951c26f2999939741b34e848edf27af610dff32.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986189996100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- 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 18 13:16:16 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=1692986184; cv=none; d=zohomail.com; s=zohoarc; b=lZjy23AL4u0tw3b6/K9cZzkRyBBn2uBt8snNqauY8dfBrQJz39f+MquXbOjEPXfpQ/tqpXZb0Gp3G6oKdCAtsObjM7M40vdav0JfEgpGkRvpwURbrrdiVkYi9H4wd6hEzLgrtq3vdvRR0Zem4D8VcCh5vEEeRQ7EOapPNAVqkJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986184; 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=TWviaI5RNBuga+YZIcj97ub1pGjAFPzmpXkCl7WfLQk=; b=cOZeIfG9HSHH+mzJDsNPBzmlY199Pk2cMkQ4bfJG1IdVVmD5ZFdkoP/uWrFZbYvai4LrlzGpKAQY6/fGJ5iNGVfiIzwWYRi/tG4QGphwAxxWREqQxUdI6GPMVcpl39bSgN5iH6SMV9zxU2AFBgnrRMFit/HjeedjLi6Uxd2MM8U= 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 1692986184359506.79428966305784; Fri, 25 Aug 2023 10:56:24 -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-421-m8maTlpEPLqpl0n_ar-doQ-1; Fri, 25 Aug 2023 13:56:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B413107850B; Fri, 25 Aug 2023 17:56: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 1266740D2839; Fri, 25 Aug 2023 17:56: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 E8C8819465BD; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 570FC1946A43 for ; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4618340282C; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0627403166; Fri, 25 Aug 2023 17:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986183; 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=TWviaI5RNBuga+YZIcj97ub1pGjAFPzmpXkCl7WfLQk=; b=dKoy1qPhw0rYsebdSFTZrVHu+e8EOpmIGgV/vc4PFNWQpAne5titJ5kztCxx4Ho51zeCWv AMqVW7jijun0yU+HfRFQ0mZcvwFZuAn+gVJzPQ0lPvOxAoL0isxvuNFjRTuoJsA3udX+n6 kdYebyR3xAYqFKHCLQqmF+y3xzll8Zw= X-MC-Unique: m8maTlpEPLqpl0n_ar-doQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 25/33] ci: helper: Add a job argparse subparser Date: Fri, 25 Aug 2023 19:55:33 +0200 Message-ID: <88960da15b25e16674b1cb6a2eb082e439fab441.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986185476100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/helper b/ci/helper index 75552774f6..60fdaed5f4 100755 --- a/ci/helper +++ b/ci/helper @@ -114,6 +114,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 18 13:16:16 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=1692986287; cv=none; d=zohomail.com; s=zohoarc; b=fvUxk12OqLxgUpmMSqZBk0zio3UaQoJxQ/4HbXWFv2z8IEz7+XaG09M8gy6eQnuyXH4s/WCpMfMavIyKpws/p6zQn4+S4wsTJvpo+PuP8yN4/lgHcLaO7rUC9q5eqWITLHWA6AEkb2RuxvftDbHh988DR6uKF0JLg7P67d61OiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986287; 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=E8osTw0eaDWNQGUrJQjpH7Beqw4hBLrIht+qG6Y+ozY=; b=Py7iEBwXYFYiPWJ9SVHgCCNI1u+zQO30X4f/aX4uYXj60EMopXMKKEeQIALrYf1NKBsUMLgXqcNdBAH7dQf+6uQxlyjcPCm9uprbhbYe7+3Vst2ezc/xJ10kn/OoNsOvIeqvDvzLOQ7ChYyw4zxhkmRGlgIb6vk8xO/6TpOv4pM= 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 1692986287819768.7324364309397; Fri, 25 Aug 2023 10:58: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-278-p6RmXH_OPVm50eONE6RYxg-1; Fri, 25 Aug 2023 13:56:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 721E38D40B2; Fri, 25 Aug 2023 17:56:05 +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 5E00A140E950; Fri, 25 Aug 2023 17:56:05 +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 4F3CA1946A4E; Fri, 25 Aug 2023 17:56:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1C6E01946A6C for ; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 019B44021B9; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EA984A9004; Fri, 25 Aug 2023 17:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986286; 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=E8osTw0eaDWNQGUrJQjpH7Beqw4hBLrIht+qG6Y+ozY=; b=d3a/dq1SsyyYYzgXHXCF1BfTKqPzvHLHUg8nr38W0rlLVx6u3HN1Vo0pGK1Up+0yt+UmGP XkaF0jpInmmnXFm7yFyMTi7PGDVP/e3rYQ7Vt65e9nnOIRv4J+H0SD5eGdTp/hAX6OC106 aTJma0uCmw2/11hFE1Sab517Ev8Zr18= X-MC-Unique: p6RmXH_OPVm50eONE6RYxg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 26/33] ci: helper: Add a required_deps higher order helper/decorator Date: Fri, 25 Aug 2023 19:55:34 +0200 Message-ID: <6b38f030f49681f6fcde1668b6f39b9a06655cc0.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.7 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: 1692986288754100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ci/helper b/ci/helper index 60fdaed5f4..780f4161f5 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 18 13:16:16 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=1692986185; cv=none; d=zohomail.com; s=zohoarc; b=Sqz660+PtOBqrWh4/QzCzxa1PKJLwRez0EhUaGVeHaPdTcCHCLIHPyDyy/dZrGvOhrvXtDaUxa4/yh55Budgs5o+2YrN9X44oRvFcN6P20V28hIK1y8s0zFsDcS5W26nV2UuqA8AIL1Ba1RGXmEWAyiAdZPaX6d+4w4Tv8O4vYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986185; 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=xtRaUZ96J/xOnKOTHHJ+Sf48JllM+TpxA8K+Zt18PaQ=; b=jog9cX0EqlHttq5908enOhOVjab66iwxiHHt2ZI7UutIDXtwR8eLpDPiDH07xvpvb5PulF331qmSXBhNx38ifcpvN64zTvlrNPKkC1wL16Dw0EA9KWZMTUm3L4UQhYJSIRgSt+mqToi8gb2zEFJqhwJSyXBUgj/fWp/goeWqEsc= 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 1692986185063785.3476703137507; Fri, 25 Aug 2023 10:56:25 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-384-OtWOyYn2MD6WQtex6FwAkA-1; Fri, 25 Aug 2023 13:56:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7BB7280FED8; Fri, 25 Aug 2023 17:56:06 +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 C461E2026D68; Fri, 25 Aug 2023 17:56:06 +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 A181419465B5; Fri, 25 Aug 2023 17:56:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E02FF19465BC for ; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B4C9E492C14; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AA794A9005; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986184; 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=xtRaUZ96J/xOnKOTHHJ+Sf48JllM+TpxA8K+Zt18PaQ=; b=Cb0+vA2ht8u2zeHfisgQb3oxwkZ29hTWJNJGx3TnNiMUvsQfTil1ngQPxPVHgB7qoLnAqW lAaltZwmHiW6kQz4q/W9S0/DFKKhxYapriPRBHYSsbsnVh8nB+ytk0OPjaRXTOsY9yOfYM QIXl+XwGphilmRC9QX4G8oEJduwtqgk= X-MC-Unique: OtWOyYn2MD6WQtex6FwAkA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 27/33] ci: helper: Add Python code hangling git clones Date: Fri, 25 Aug 2023 19:55:35 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986185947100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/helper b/ci/helper index 780f4161f5..2a51ce1786 100755 --- a/ci/helper +++ b/ci/helper @@ -174,9 +174,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 18 13:16:16 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=1692986226; cv=none; d=zohomail.com; s=zohoarc; b=I3D1ZRQUceG3sLG+D5YKWW5/L36Dp43RnSR8JayhhdbE3AUXqaeliPWlJHMmDfiEJyAJNpcZezyq+P6OxS/PPM4wFmjWOeO0a8SKgdYj0QVZfbpNqqI0UrUsP8GfbE9CHrO1tVrNjD7PtbyQ7io4yhbbhU0VltxjCn7jb4xdpgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986226; 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=dQXAr+NqTY4JHPdv8M7Abjw8nE7z1XYdpmn0RfG9Ea8=; b=hI7lw1MiCxcsxc2S6xFMw0Vq/azA9mFYqUrNa3jxEAZuRbUDs9C/vR3dNeokz0fWREsUIJSOnIM4bJnqu4plWQ+Av+kPnprtRs801ISxwr3+eJNBI5bDG8jMSFiPxS/7YSHntexNz66YaDb7bxGUEOOP6/8W9tVnq3N1V2+luRk= 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 1692986226724853.537296684726; Fri, 25 Aug 2023 10:57:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-444-8U-3ZrvdN2abDnoDbYrAAg-1; Fri, 25 Aug 2023 13:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33FC83C14AC6; Fri, 25 Aug 2023 17:56:07 +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 1EADC140E950; Fri, 25 Aug 2023 17:56:07 +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 E5EB019466DF; Fri, 25 Aug 2023 17:56:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87E9F1946A67 for ; Fri, 25 Aug 2023 17:56:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 726234A9004; Fri, 25 Aug 2023 17:56:05 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDCAE492C14; Fri, 25 Aug 2023 17:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986225; 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=dQXAr+NqTY4JHPdv8M7Abjw8nE7z1XYdpmn0RfG9Ea8=; b=Avop0y7MAjFVSHclpdyTx3gdErTOyVvGJhTwfKkwtrPX94Cn/xXCdxRiry7tLXKxQ/DTEt +4YGkDPdxH2OCQlDAJHvmDsphqV1bS5cTTRgBjOTUT+e7htGTyS9+ffwkMA28AMyTXHFO0 0eKwOpQo37xkUhIMoLLAow6xQL3O5DA= X-MC-Unique: 8U-3ZrvdN2abDnoDbYrAAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 28/33] ci: helper: Add a helper to create a local repo clone Pythonic way Date: Fri, 25 Aug 2023 19:55:36 +0200 Message-ID: <2fa855bc00e1ef4b680c2423bf8a7486fdb1251f.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.7 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: 1692986227780100010 Content-Type: text/plain; charset="utf-8"; x-default="true" A proper Python equivalent of 'git clone --local'. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/helper | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/helper b/ci/helper index 2a51ce1786..d704d1f711 100755 --- a/ci/helper +++ b/ci/helper @@ -211,6 +211,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 18 13:16:16 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=1692986226; cv=none; d=zohomail.com; s=zohoarc; b=PWk9JGUqjWPt6w9ZDE+Bjfp0L8e2VCrsMaWWHBGkJwkydZOXPgOuMnWR72dBA8XgKrmPtoqcLNrPYIcHiiDIZABHd+dskXXvgRG1M8G8GINA0AUFLROGVtcmSEg5TVXZWk4Z8xslj8SVY5uwI3+OCc/2dyVchpWgk0kxd7SGY1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986226; 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=Dr3sEkV331s73i+4EW6mobRyNg9I+gqBHXm7YKd0oGA=; b=KSpheXuvYsGQPiyKxODFWPJhyiLUcXr3Jyx4EzzbUag4dit4PD/wbKp58F0Lvd4sMELpxRmesHOorVvs+lfdwBt6DwJj5KaymdrxVu/w6rzQbKYEqq0HM/Svj9+MbvC0x0JgKwh6uXP1Eg1IpHSWYJTe6rVO+rVPXc4klizBGtc= 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 1692986226853127.11963181656415; Fri, 25 Aug 2023 10:57: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-269-H5BOu30sNMOKE_ZIFOkEJA-1; Fri, 25 Aug 2023 13:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A4D38D40AD; Fri, 25 Aug 2023 17:56: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 4804540C2073; Fri, 25 Aug 2023 17:56: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 2952619465B7; Fri, 25 Aug 2023 17:56:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5DB5019465B5 for ; Fri, 25 Aug 2023 17:56:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3F648403161; Fri, 25 Aug 2023 17:56:06 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB81A4021B9; Fri, 25 Aug 2023 17:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986225; 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=Dr3sEkV331s73i+4EW6mobRyNg9I+gqBHXm7YKd0oGA=; b=idmV5Yo/GBKZLYwCOgE+gi5pFI1R/hF1ZZHzfpRxu+kialTWwfmoEhTIjC5ZRCaSALhUyL R1Us+IBK08ZCz7C16X4RdpM5jKdAS19yZdAXRfcw3QzjjaBhBHmTNAf/v8QLS8uneMnz35 r06y47I4a0y9Z/rE3rOBdF4uFgWOr6I= X-MC-Unique: H5BOu30sNMOKE_ZIFOkEJA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 29/33] ci: helper: Rework _lcitool_run method logic Date: Fri, 25 Aug 2023 19:55:37 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986227719100009 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/ci/helper b/ci/helper index d704d1f711..887e64ece1 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 @@ -216,8 +219,51 @@ 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/build.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}") + subprocess.run([self._args.lcitool] + positional_args + opts) + + # this will take care of the generated script file above as well + tmpdir.cleanup() =20 def _check_stale_images(self): namespace =3D self._args.namespace --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986289; cv=none; d=zohomail.com; s=zohoarc; b=ejxuHuFk/SRajO7calg3vNtRD/5Etjx8MgF1nl4+DYWHtksG1IxpEIMS8D1PrdNrC29hSYircHScQYiIjFxJ0lAzxsHl8zbR1Qk9epAp/56dyfagROKaNCzN3UPYmHrei5G77BZGhVh1Q2vxAMLymyL4CV5NPdk25PUkCU3ntv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986289; 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=ELg9e8p8bMYB+4HD58AjbwhLlIZlAoh6TcRVwJ+k+Pg=; b=ZAE4naOC7cThmCg1kmTQjKbh9Sy9lR0jbtJKHBXKety29bwzU9/ulahCLD12eGDHESo0eD8dta3V5K1RBHUSHMnTbX4pAG8qWI1+2qsYQr5kepbnOXzXnPRT+k4rYQyAAF3o7yfIjgwENgGzIyp+AyhYMxh2MHK7wZkjUoSTxqg= 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 1692986289359296.4331224208547; Fri, 25 Aug 2023 10:58:09 -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-124-N0E6fyT2ONGDT0J39IYnLQ-1; Fri, 25 Aug 2023 13:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBB808D40BD; Fri, 25 Aug 2023 17:56:08 +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 A81F16B59A; Fri, 25 Aug 2023 17:56:08 +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 99BC91946A4F; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3C45219465A8 for ; Fri, 25 Aug 2023 17:56:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2E92C40282C; Fri, 25 Aug 2023 17:56:07 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A899492C14; Fri, 25 Aug 2023 17:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986288; 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=ELg9e8p8bMYB+4HD58AjbwhLlIZlAoh6TcRVwJ+k+Pg=; b=fNxYovRnGgzC3X1cMd5Qg/E9prAEtARuEuCpqvb6CFnuBa20cTaRxgv328HC9/k/+S8N8L x0crAL1LhKSEEq4VMbrMBEgSyvvpBWxNRqUlARfHJzGrXU4FqVwf3leV5IpdCpQ2x/OIpr v2rWogNZrwQZ9nsvbTrcHKTq2zKeIGA= X-MC-Unique: N0E6fyT2ONGDT0J39IYnLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 30/33] ci: helper: Add an action to run the container workload via lcitool Date: Fri, 25 Aug 2023 19:55:38 +0200 Message-ID: <371c9fcfc9d374017275b6cf6ffe3cd0fbe10960.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986290058100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/helper b/ci/helper index 887e64ece1..7385d3b95c 100755 --- a/ci/helper +++ b/ci/helper @@ -305,6 +305,10 @@ class Application: def _action_shell(self): self._make_run(f"ci-shell@{self._args.target}") =20 + @required_deps("git") + def _action_run(self): + 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 18 13:16:16 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=1692986225; cv=none; d=zohomail.com; s=zohoarc; b=YWXsTbumu4po5SKamnDcfHiGBIo1g9FA3rb1b4+UbEy0EbNNrOTKY60uaoSr6ZaCfctspktwzaWfPBeKtunir5WBr6aFw43oSXG+ZgyB+5w//PwdAoNjHVHOJ5/mvCNXpQnGhuPDF9ZY2fem5B3YoPPNCCHyTX9Quy/QbvX/Fjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986225; 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=RI/gl+ISBmFzIi+ijIvWKKwR2kKJnA1E5jSlyxLpO9M=; b=D/Jz+JM6HtbJzN/FEjR42YlEfktUZ0dn5aJ5O9gz/nTla/if1QzgRCtWzxBOQugigqpfwv62+zFI6HhIgGi4dv2tvRvSyglizmvi1+EEp+CJHwQJxXgvzn7ly8oXoT8rLruyeriL/nRkC0iZM0c8R/AoMwz0vJLmAUzrLz6AHcI= 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 1692986225251825.5965426893199; Fri, 25 Aug 2023 10:57:05 -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-516-0q-PryfGNhiuGARyV7NDtQ-1; Fri, 25 Aug 2023 13:56:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA73B8D40DC; Fri, 25 Aug 2023 17:56: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 864102166B26; Fri, 25 Aug 2023 17:56: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 79E911946A62; Fri, 25 Aug 2023 17:56:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 15FDE19465BD for ; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BF5E4021B9; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70E7D492C14; Fri, 25 Aug 2023 17:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986224; 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=RI/gl+ISBmFzIi+ijIvWKKwR2kKJnA1E5jSlyxLpO9M=; b=aL5/CLlPX1BLgrFK3zzCB1zT4snw1Qf0cx6XNesaQtQ1+nM33mYiZKqMQPaCSTZ5NYYeGp eLEyOmJLE2VW68fEN3VTUff362io5CHtCR5h9m3Cq7+nn2QofXDYnxJbhiUPu5kX0T+oCP RW739JOZVbc9yGBFsaidF+iETofYKOA= X-MC-Unique: 0q-PryfGNhiuGARyV7NDtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 31/33] ci: helper: Drop original actions Date: Fri, 25 Aug 2023 19:55:39 +0200 Message-ID: <0158bf22ab0593a8d27d4f16823586c1d82fdc8b.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986226246100007 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/ci/helper b/ci/helper index 7385d3b95c..07e449e59f 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", @@ -296,15 +269,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): self._lcitool_run(self._args.job) --=20 2.41.0 From nobody Sat May 18 13:16:16 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=1692986230; cv=none; d=zohomail.com; s=zohoarc; b=Dp1f+l469opsOeRhF9IlxmFa7eBrPj/gz4euoTUkydSMNVHuX7EzuEa3HrVp/Y7vD3UHKBQ1eukvjkmigJXVHXpfuY9vCVqdBoLkVMbzYj44kOicXk9js1M1neQj362ObZMZ0dO0zjfOQ6Z4mWevkKfNXMyOJ6o9of8bn6k6wH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986230; 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=oWkOhHLPLMvb63DLlMb74ksTHTFg31azCQPAXonVOg4=; b=B/HzBNoPYgaWILP7yItxjQp9Qbe9K45+MauRZUbwjqDC5Ehua162BJw+2EMhgLjwP4MrI/kuHv/I8GtVCdFwt3M+2zlcPDNFKqCo7zNt5F9VwIsxPgVM8mljgGEFYcHq3IQweQze7B+mv+/KuQ+sjBJzDGADnZ+NgkaJjZ/kMtc= 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 169298623032584.74681719206387; Fri, 25 Aug 2023 10:57: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-206-kHSoCDu3M4eGSpWXyBU5LA-1; Fri, 25 Aug 2023 13:56:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 116BB85CBE0; Fri, 25 Aug 2023 17:56: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 ED50A40D283C; Fri, 25 Aug 2023 17:56: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 E009219465BB; Fri, 25 Aug 2023 17:56:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E1FDC1946A51 for ; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C7C134A9005; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D110492C14; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986229; 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=oWkOhHLPLMvb63DLlMb74ksTHTFg31azCQPAXonVOg4=; b=byjByD4+ZoGZoj37QpKNRz3qOXLPVn04U36Gg7eBaoIkoJ4GL0f8oObMbcpgXQht/bpAT/ Cr6fhTcB7vo98Db6esVQ9h7H5u0s+C2NB7ajAX7JnqENuUeQ+8iJZDEZI54eyo4vkwCS0U osVcPtMF6Jfc+6PKm0LH8wrYEnJe8/A= X-MC-Unique: kHSoCDu3M4eGSpWXyBU5LA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 32/33] ci: helper: Drop the --meson-args/--ninja-args CLI options Date: Fri, 25 Aug 2023 19:55:40 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1692986231809100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ci/helper b/ci/helper index 07e449e59f..0053fce40e 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 18 13:16:16 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=1692986244; cv=none; d=zohomail.com; s=zohoarc; b=agwoiAumEl8S4w8s3UBBR47hXOor1vIPKfsjRor6ZuqNLyqk1145fLWd68EgEKgsrpPP8UdEoIkq6yJs3RG/OlJOm5IyVYllF9ftNgBbm4lraa1WuMgD2BG/cd7gpRBMgPwV897N+qXmMw1x9KZFjEy74CM9OwlG4hfMmgtNOOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692986244; 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=cra0QD7aNWBrA3WXYElgC/9IGDUxiYC8O8CJxRYSX/w=; b=fyiTqnqbMWO6uppHvxxPPoDoBMoRarrjZtVBkWhDVS6oxO2Dj6C34r4y8GS+yohv9TDsjpoNXVsB9o7Q5dZsCiADRG4mYGcdNbfIsJIosmD/mBBxx4SKRzvjJpoC1CaaVhcjilzTC4+H2cTxHyLR1P/hREFjNr3KmS62vxM1eGE= 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 1692986244100405.98864946347203; Fri, 25 Aug 2023 10:57:24 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-282-tLnCMic_N8mTbkY9lbVVAQ-1; Fri, 25 Aug 2023 13:56:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B0DB38288A3; Fri, 25 Aug 2023 17:56: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 ECB9F140E962; Fri, 25 Aug 2023 17:56: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 CFAE81946A46; Fri, 25 Aug 2023 17:56:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9118F1946A69 for ; Fri, 25 Aug 2023 17:56:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8586F40610B; Fri, 25 Aug 2023 17:56:09 +0000 (UTC) Received: from orca.. (unknown [10.45.225.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D24D403174; Fri, 25 Aug 2023 17:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692986243; 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=cra0QD7aNWBrA3WXYElgC/9IGDUxiYC8O8CJxRYSX/w=; b=NZbo9oAFvrVGgE8e8E9/+cv24lVIILDNQb/xop/o/Wdcpu35HUlUhf9ZD6QpsIj4PpazbT jNoKK26XxUGdy3kYdkIrWCGAAGnVQn4GYFmxsegzkkBZtNOO8Rc/c9ozNs7MG0JmO9MOJy NTns7afKWBJcBY2ZoKrGDQcTlWDCXd8= X-MC-Unique: tLnCMic_N8mTbkY9lbVVAQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 33/33] ci: helper: Drop the _make_run method Date: Fri, 25 Aug 2023 19:55:41 +0200 Message-ID: <6ac9d6449d9a6f634d59751f00086b7d65be8c27.1692986130.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.7 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: 1692986245788100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 --- ci/helper | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/ci/helper b/ci/helper index 0053fce40e..e45eb63016 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