From nobody Sun May 19 03:38:28 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=1675691662; cv=none; d=zohomail.com; s=zohoarc; b=gsjExSxAUuS9RzJPivFxUmN6yXLAgmiOcqVlVUlH7lxg+D2JI1kcZXn70/srxPnDq7jS5SLAEgFuibnyOih/raEPliahLKUL9/OV3hN2POXxc0IidspxxtaTgwj8HUyImGBs2qvDoiNQHuG2Q0jfAtKPR64O9t+VMh3mhJcGk3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691662; 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=nHc4cM/gxSK2M0+RhLBSXEX574y+92IsW+lo1/pixso=; b=Y27pmAeGXArnV2JrzsZ5SFzYTY9gxSGkqdzMQq//uT6gkuYqLz9UX/QDN0pmTwJE/DUw2HbB5b59KmrvP3n2RLdB1K2CP9U1wSD9kcHRuwrdqf6hjRH5V8++AoyTG5mnv99YRnhA+2o1jMCpm17AvLty5SQlvVpnDQFga4J4WtE= 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 1675691662667750.4088420941988; Mon, 6 Feb 2023 05:54:22 -0800 (PST) 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-594-XuOxLfyQPiiPTgOhyhIRJQ-1; Mon, 06 Feb 2023 08:53:24 -0500 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 EB807803D53; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D06741415113; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0890D19465B5; Mon, 6 Feb 2023 13:53:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AB83F1946589 for ; Mon, 6 Feb 2023 13:53:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8EFA01415113; Mon, 6 Feb 2023 13:53:19 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D1981410F36; Mon, 6 Feb 2023 13:53:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691645; 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=nHc4cM/gxSK2M0+RhLBSXEX574y+92IsW+lo1/pixso=; b=SZio+D7XTaEqLbHiA+YBQixpEvx9i+vA/daGuQv3uQFyJOa7AMX5JD9xvhfinKvgxkV2Oe Vv7jrNa+Bo7u3OdG7y3+159ScMWAaQpDAzwElur8cp1/nJ3iG66EOqaHvLp7FcbQlraZiN NXymGvsyHc0mVOXGW1A+/CA+4wnPIWU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691661; 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=nHc4cM/gxSK2M0+RhLBSXEX574y+92IsW+lo1/pixso=; b=djvf54Iu+zYa5jzDeM2bZlsM/wiJcQxKWKUGy6IqIKc+snxZ+aOm088RYA4L02vuYEVBXG xLwYrjyBF3OXwRi5YdtPhwLA7ZJ7zT0sKjLls0n1PGO+ujCWqfAwn7blacANtwAvm7ThXV px13WV43sum5XpDAKqGA95Qzo2+6V80= X-MC-Unique: XuOxLfyQPiiPTgOhyhIRJQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 01/20] gitlab-ci.yml: Replace all explicit calls to ninja with meson commands Date: Mon, 6 Feb 2023 14:52:58 +0100 Message-Id: <0677abfba05712b55e5dcd7b897e9237b7d7be8e.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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) (identity @redhat.com) X-ZM-MESSAGEID: 1675691665780100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is continuation of what commit b56e2be68e3 started. If we stick to only calling meson commands directly, we can achieve much better consistency in passing arguments to meson especially if we unify the recipes run in gitlab CI and what we can currently run locally in containers using docker/podman. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b72ebc493..699be460ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ include: script: - *script_variables - meson setup build --werror -Dsystem=3Dtrue || (cat build/meson-logs/= meson-log.txt && exit 1) - - DESTDIR=3D$(pwd)/install ninja -C build install-web + - DESTDIR=3D$(pwd)/install meson compile -C build install-web - mv install/usr/share/doc/libvirt/html/ website artifacts: expose_as: 'Website' @@ -110,7 +110,7 @@ website_local_env: script: - *script_variables - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - ninja -C build libvirt-pot-dep + - meson compile -C build libvirt-pot-dep - meson test -C build --suite syntax-check --no-rebuild --print-errorl= ogs =20 codestyle_prebuilt_env: @@ -153,8 +153,8 @@ potfile: - *script_variables script: - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - ninja -C build libvirt-pot-dep - - ninja -C build libvirt-pot + - meson compile -C build libvirt-pot-dep + - meson compile -C build libvirt-pot - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile' --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691620; cv=none; d=zohomail.com; s=zohoarc; b=G4x7dnCWStEfxOE/W0oCNpBVn6dCVmAEgAKiM2gKoe6cfVjzzzfpPHNUYkj/zoZWTYJ9wlp2XwIjuX4znYQ15MmAxUJXmwnQQ4m/ZPIckK4Moj5MnGiJdkc7F9eSbrCZGsx6/pMQuDuH7y4+Ppg4AiBlltRaefNhBeFmvcpJF7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691620; 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=CgIg/7t0fXxQBvm+MKIWwBh0DYqP7wyMJDaMXDcit+Q=; b=XL9RWcpZH+h9uriI78oQgzaF128p2j4wzPQcsMcaVsF3ZM1r89DHy7GkS7h2Esv9K3M4pZyWkONldChMMidsB2637VZzM5SctZKAl2AHD3GM4PxH3avVUqrQJpQpWNe5dh6HKVm6IAc1N4bga/tN9v8JBr8vPf/RetE2ZsU7LSg= 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 1675691620840519.3932364475961; Mon, 6 Feb 2023 05:53:40 -0800 (PST) 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-634-pgXFireYOfiX84Cr8pcK2Q-1; Mon, 06 Feb 2023 08:53:24 -0500 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 772EA85570E; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 631322166B2A; Mon, 6 Feb 2023 13:53:22 +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 05C99194658D; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 696C21946A42 for ; Mon, 6 Feb 2023 13:53:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5B37D1415126; Mon, 6 Feb 2023 13:53:20 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDE42140EBF6; Mon, 6 Feb 2023 13:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691619; 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=CgIg/7t0fXxQBvm+MKIWwBh0DYqP7wyMJDaMXDcit+Q=; b=F152bghlUgxGihrsKther5Ho9YXhCwL5s28LQfkDKDNVEkX2D5FKxg09tUVLPwAN3dQeUO zOdir+SIPSxqoAjtG6ECmK4yjRtAfmzhg0F4MfOihHVhFcV3+GKYHkLOoj7q0gSLjV51j0 JdAiz0UPRNhVV8rvtL0mErXOX9A83ek= X-MC-Unique: pgXFireYOfiX84Cr8pcK2Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 02/20] gitlab-ci.yml: potfile: Consolidate the meson compile calls Date: Mon, 6 Feb 2023 14:52:59 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691622706100015 Content-Type: text/plain; charset="utf-8"; x-default="true" You can specify multiple targets at once for the 'compile' command. Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 699be460ca..e20d0b9be8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,8 +153,7 @@ potfile: - *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 + - meson compile -C build libvirt-pot-dep libvirt-pot - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile' --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691610; cv=none; d=zohomail.com; s=zohoarc; b=RpbGD9IuVMWWjSuM+SlY/eywjM7lrIANBODaNo20prIdjM39fndkFGoaVAuJs0RQqBwl+6aR2Rw3ywhc6bS8kDY+4/w8FOkGQ3j6WCZ37fdOEpYT2mUS3F6Tbn6YSZWNIKXJ9/tLTAfk1BDQNRfID+0LiK3pJkg/uKfCVQ8EIHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691610; 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=J2DOMLKoyKE+ojSCsiEhnRteK6T8VddCr+ZcW0/mkd8=; b=gbCDFmIM/3ow9O08DsJu2RmeRPggmGyl6yERlqOU36BMs3KFUFW7jVg7YiFvIxKQjjAwNSv5Lf6DOmPCaFZQ7gvWSbiZPeYQf076pJXrTMqmXQ55iU3vJNL6Fc+5jTZvN8wtp76LmeivlYB/yfFmnNOrrTdR8vYCBcYxLThla4M= 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 1675691610596292.1800439007179; Mon, 6 Feb 2023 05:53:30 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-354-SslbjxP1Pxa4AW4LY5P-Og-1; Mon, 06 Feb 2023 08:53:25 -0500 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 C682E3C0E459; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1D01140240C; Mon, 6 Feb 2023 13:53:22 +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 41CB91946A40; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 344EF1946589 for ; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 270BD1410F36; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99686140EBF6; Mon, 6 Feb 2023 13:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691609; 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=J2DOMLKoyKE+ojSCsiEhnRteK6T8VddCr+ZcW0/mkd8=; b=ZTJU/oKFZCsicZBLkOND0/8dC1/MQFV5upduk95K5syFBgI+xvsMrCbzbCwX0OzbXfeKgn mFmSupinh12BwvbGlO3H7bJwirGQyUW3zVG4Bn4SwlzwKRtLXDj98Cip+9bp57mc+EOLML rJDbOBzZM/eqUJOOe68UD4HDDe4v5l0= X-MC-Unique: SslbjxP1Pxa4AW4LY5P-Og-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 03/20] gitlab-ci.yml: Use $HOME for rpmbuild's topdir instead of PWD Date: Mon, 6 Feb 2023 14:53:00 +0100 Message-Id: <2937cd11e8c24616571e4b3e44c24b40d1b2aaca.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691612561100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e20d0b9be8..921b04cd7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,8 +30,8 @@ include: - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then - rpmbuild --clean --nodeps --define "_without_mingw 1" --define "_t= opdir $PWD/rpmbuild/" -ta build/meson-dist/libvirt-*.tar.xz; - mv rpmbuild/RPMS/x86_64/ libvirt-rpms/; + 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; --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691609; cv=none; d=zohomail.com; s=zohoarc; b=h9K1ZONvUSEQryvXYg+Dy73b9E2RRNjK6llpGX2u9/V309eiP13u8l5EgNfWnQ+YVKJuvjoxIwmB2Tia1xFoOPtCKhXOmhNc6qMhQsf4vRPUpVPjlh1wGZQ+NjVNbwyBD4d4+3INOl20Q8Fml6vPMnlwfrDw2j6daOTAIiwpNIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691609; 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=/PHPs4fbzRcDFQ3hpQubJeD7KgYPiOxlHqSr4FquouE=; b=DqlsS5hMFUEI9pf3vZZPbxOrcVBG9nTjURVusFOhMo/i+xmP0hzkPaYxf+gwuxB6DQikh0+Qj1JJGfErQn4CitaSCJ2GhV6Tp/Zi4MsMS4tP+pUVhtflFFNwpaS3DuotW7rranlJxUPigbVxl8LkmjVUq3JfbyPj2BngNpZN4cw= 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 1675691609259585.3365871139328; Mon, 6 Feb 2023 05:53:29 -0800 (PST) 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-342-0gtPJvtzO2eQxTztNKXKfg-1; Mon, 06 Feb 2023 08:53:25 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC0DE100F92A; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B146DC16026; Mon, 6 Feb 2023 13:53:22 +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 3C61719465BA; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 005FB1946589 for ; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E88A91410F36; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 650D4140EBF6; Mon, 6 Feb 2023 13:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691608; 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=/PHPs4fbzRcDFQ3hpQubJeD7KgYPiOxlHqSr4FquouE=; b=arO07Gmc4AKjY8DkM+bLiL+D7IKbbxEBSUQbLtvPjChgLQo62HDviJPxiSF81rDOkfuhiT bkdRj5TZsRJm9K67lT7mpY9YFVgzXzdgmhKc36t0ZwyXGTVK3Em4Ijq8epfFOXAT0hig+B i5y9C1LZ767737KCc+S9THbsgd0Qv7E= X-MC-Unique: 0gtPJvtzO2eQxTztNKXKfg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 04/20] ci: build.sh: Drop the commentary about CI_BUILD_SCRIPT Date: Mon, 6 Feb 2023 14:53:01 +0100 Message-Id: <54c7693b0e023218402bea8b2c26c7ed8ffff029.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.8 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: 1675691610775100001 Content-Type: text/plain; charset="utf-8"; x-default="true" build.sh is not the place where this should be mentioned as the official entrypoint for this script locally is ci/helper which can download the right image from our upstream CI registry. Since the idea is to ultimately drop the usage of a Makefile for the local executions, this patch doesn't provide an alternative place for the comment in question as the functionality is going to be altered substantially in the future. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 0f23df1fa3..3fa28eafa8 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,14 +1,5 @@ #!/bin/sh =20 -# This script is used to build libvirt inside the container. -# -# You can customize it to your liking, or alternatively use a -# completely different script by passing -# -# CI_BUILD_SCRIPT=3D/path/to/your/build/script -# -# to make. - cd "$CI_CONT_SRCDIR" =20 export VIR_TEST_DEBUG=3D1 --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691653; cv=none; d=zohomail.com; s=zohoarc; b=B5AJ2ABIHRswzMhif75FEJq9Yz1/Rl8IFoaYo7nhyPVE3om7S+/3jjmOhP3F319Sakdjk8eN/IshhhPDoOY0PCBFxZ1iqxnUfOnLEF8FWuG+mB01z8TFDe0svxuhskZW8IpIOKRBP1NsUfCNjjgPXgLJLDDOYkzMOuRaNImRZAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691653; 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=xbFyWkTFo2ROC0Mu4ju2pSJPZJcNyD0n5JNyovW96Vk=; b=fBi0Qol/nS9SGzBLV5eIAel5TAOc1LQwZGMU2q4V8kXjHA+wnypApnyiIfvOXlINWyHN+4svGsAl4rGO8T4buUCdQZxGVZTv3yreiaSpHwmFAcYXfs78iEE+9sgCSktSH8vhlXv/QGwIPQNfaZiK7Y/2Ai9Wcdt//pkXIZjoDKE= 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 1675691653842782.9072111578406; Mon, 6 Feb 2023 05:54:13 -0800 (PST) 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-45-lZkp7-62MsCtp4S8g95o9A-1; Mon, 06 Feb 2023 08:53:32 -0500 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 B3647100F82B; Mon, 6 Feb 2023 13:53:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CDC9492C3C; Mon, 6 Feb 2023 13:53:23 +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 85582194658C; Mon, 6 Feb 2023 13:53:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D64F61946589 for ; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B92CE1415126; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 332011415127; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691652; 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=xbFyWkTFo2ROC0Mu4ju2pSJPZJcNyD0n5JNyovW96Vk=; b=S+nWaG1YtDJw7WWmrQZcve7Vxr8HHWUTK666FQQXVwRj4y8eEYbRNRdpWcdst6bNijYCmy DACZiWx0cq4OhI7WI4lymwySunT2nBbMRk+Q7rCLbRxBEJnwYUwnmwE3R+T+zhVYqCYB/p NiyXjEJwwb+0RiXQ9Gb1Ghhy1o1ueNI= X-MC-Unique: lZkp7-62MsCtp4S8g95o9A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 05/20] ci: build.sh: Use 'meson setup' explicitly Date: Mon, 6 Feb 2023 14:53:02 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691655766100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Even though 'setup' is assumed when no other command is given, we're being explicit in our GitLab recipes, so do the same for the local build.sh script too. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 3fa28eafa8..c7cba6ffa8 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -8,7 +8,7 @@ export VIR_TEST_DEBUG=3D1 # populated at build time from the Dockerfile. A typical use case would # be to pass options to trigger cross-compilation =20 -meson build --werror $MESON_OPTS $CI_MESON_ARGS || \ +meson setup build --werror $MESON_OPTS $CI_MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 ninja -C build $CI_NINJA_ARGS --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691613; cv=none; d=zohomail.com; s=zohoarc; b=k11rP2Z+CZZvkGGYJm9Y7j9yFpt0SSzsn1u4bS8yV/44fGlfStJW5y4s0dPwK8ewZS9PshFaL5ou99J/5+nc6PtdYJORIuXQIa9H8NlrkHJ4wQwgr3U1C0NUxo90LJlM27A9auRvarIftzuAo5bBWz6kfMYpTSDdzddsAnQQyGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691613; 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=zWWWE+utDK4Q/MaCeyiJ1swDOwcBSgtQN9+R0jaFP7g=; b=CQJGAbnDqi/TVtA5QkR2hNVUCf3PUUR/QU+JBIn2EJoKSe9AIBHgrm1SGyOgIaecSJwJw+qTuiwjA9/U2VfazB7MuYid9+ekeuwHsRdBH5vNINEjIZKKEELuReG6pxV0bHXX9+sy1UNHCzIE4wvpyrstXwIuLCDKKhz5OOfcJLk= 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 1675691613134268.84721842791475; Mon, 6 Feb 2023 05:53:33 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-2uSBfIH_PqOOdIKi5zzTrg-1; Mon, 06 Feb 2023 08:53:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED60C386B74D; Mon, 6 Feb 2023 13:53:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB0B0C15BA0; Mon, 6 Feb 2023 13:53:24 +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 BC341194658C; Mon, 6 Feb 2023 13:53:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A091719465A3 for ; Mon, 6 Feb 2023 13:53:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 825EE1415303; Mon, 6 Feb 2023 13:53:23 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3A631410F36; Mon, 6 Feb 2023 13:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691612; 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=zWWWE+utDK4Q/MaCeyiJ1swDOwcBSgtQN9+R0jaFP7g=; b=PR6IlPn1b09zsUvhvj7alKgwvBuFBm7Dq99ihk99tSyesH0+HcM/3NJPjl76YCbZwyzhth Y0eyiBFViFx4Q3AClStuAM54BvtmwHdrdV5X/P26ygXseEMPcSxfxDv2+BrjuTLywFTNqO Eyd/BiSDjZxYG+wutpUZLXoYCM7wOS4= X-MC-Unique: 2uSBfIH_PqOOdIKi5zzTrg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 06/20] ci: build.sh: Always assume -Dsystem=true Date: Mon, 6 Feb 2023 14:53:03 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.8 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: 1675691614617100001 Content-Type: text/plain; charset="utf-8"; x-default="true" There's no harm in always building in system mode, i.e. setting the right paths. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index c7cba6ffa8..f6db4d2a7f 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -8,7 +8,7 @@ export VIR_TEST_DEBUG=3D1 # populated at build time from the Dockerfile. A typical use case would # be to pass options to trigger cross-compilation =20 -meson setup build --werror $MESON_OPTS $CI_MESON_ARGS || \ +meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $CI_MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 ninja -C build $CI_NINJA_ARGS --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691612; cv=none; d=zohomail.com; s=zohoarc; b=aXsyxBJPblUKFqkc2pSTvLBTttLhMA52AOwqjlcAAg1ziEn2FiNkprWz/PXW739JdcVisrZEJ+q9Kes/L4hhrtgcivi54rcK9LoN9bQteCPTYM4BEIDjH3nwpSbI2W7x4MgOrO3LJFj94DHfCwxdXqO5kDFANhpGvb1pp9wmTSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691612; 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=+tBwPRsPLQaMG1rzFhwYm2Rz5JT8OT18zgru93XNK7Y=; b=N7d7Ck0CLK5JY7yPN/C3QlrWNtG1+EffIxsLNrT2KEZx6YiTPMKCqPXBP7mMY+oIZUVjseuIAjcKJjBqkQjXUguH0bS5AZzUQELBv/auwq2krI3jyyCnVpupYV6WdP3xrDeEFViyzvxOXvy5osMoD5j9zPFOFTHAXRLY31ntN/w= 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 1675691612013697.6465485254525; Mon, 6 Feb 2023 05:53:32 -0800 (PST) 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-46-KOga8bo5N0u0NkjQ0JS4LQ-1; Mon, 06 Feb 2023 08:53:28 -0500 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 B20EC80D0EA; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CA91400F756; Mon, 6 Feb 2023 13:53:25 +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 8044B194658C; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 584111946589 for ; Mon, 6 Feb 2023 13:53:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4D7EF1415113; Mon, 6 Feb 2023 13:53:24 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id C022614171B8; Mon, 6 Feb 2023 13:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691611; 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=+tBwPRsPLQaMG1rzFhwYm2Rz5JT8OT18zgru93XNK7Y=; b=jLkyuugw8jmysPHaAuvA2vZWnz9+EzzVrAc1YQ3IGFOAbyJK9of0KuwdImAuOwIYn7cPFf pl1J9xqRhPb3cvlhoUnJSFmUbWErG4F2BUW+DmOQSvnqUWkL2jzm1YvhXhmxKl8ABvxdTa ZK7YFywt1jEl6b3R+Un8hAZO9hB5ITo= X-MC-Unique: KOga8bo5N0u0NkjQ0JS4LQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 07/20] ci: build.sh: Drop the CI prefix from the CI_{MESON, NINJA}_ARGS vars Date: Mon, 6 Feb 2023 14:53:04 +0100 Message-Id: <0e15b7f7b2de2005746e5609af4f7dcd2c58d0b1.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691612576100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Although it is currently consistent with the other variables we define when running ci in a local container environment, it isn't consistent with the variable naming we use in GitLab recipes. Since the idea is to unite the two, we're likely going to drop a few other variables from the local env configuration anyway, hence this renaming. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/Makefile | 4 ++-- ci/build.sh | 4 ++-- ci/helper | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 81f08d4f88..8f1be4318d 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -161,8 +161,8 @@ CI_ENGINE_ARGS =3D \ --user "$(CI_UID)":"$(CI_GID)" \ --workdir "$(CI_USER_HOME)" \ --env CI_CONT_SRCDIR=3D"$(CI_CONT_SRCDIR)" \ - --env CI_MESON_ARGS=3D"$(CI_MESON_ARGS)" \ - --env CI_NINJA_ARGS=3D"$(CI_NINJA_ARGS)" \ + --env MESON_ARGS=3D"$(MESON_ARGS)" \ + --env NINJA_ARGS=3D"$(NINJA_ARGS)" \ $(CI_PODMAN_ARGS) \ $(CI_PWDB_MOUNTS) \ $(CI_HOME_MOUNTS) \ diff --git a/ci/build.sh b/ci/build.sh index f6db4d2a7f..9489c4ab2f 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -8,7 +8,7 @@ export VIR_TEST_DEBUG=3D1 # populated at build time from the Dockerfile. A typical use case would # be to pass options to trigger cross-compilation =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $CI_MESON_ARGS || \ +meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 -ninja -C build $CI_NINJA_ARGS +ninja -C build $NINJA_ARGS diff --git a/ci/helper b/ci/helper index 8b8d0f68cb..fb562d55e1 100755 --- a/ci/helper +++ b/ci/helper @@ -152,8 +152,8 @@ class Application: =20 if self._args.action in ["build", "test"]: args.extend([ - f"CI_MESON_ARGS=3D{self._args.meson_args}", - f"CI_NINJA_ARGS=3D{self._args.ninja_args}", + f"MESON_ARGS=3D{self._args.meson_args}", + f"NINJA_ARGS=3D{self._args.ninja_args}", ]) =20 if pty.spawn(["make"] + args) !=3D 0: --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691615; cv=none; d=zohomail.com; s=zohoarc; b=A4kYC+yFzUnTA7yXk/hq9QHGAXISe1fhMTcc8i5vX2XBmz4Pn+m0ua+JGYRxeD1HO6Ab6mlTf5yIVTL98t7RAaBf2i37iPFOjBRKUwyGkfWRt8OxbKmOgWHw0tfN+OFmxrvpU+qX63uWqGKiEHGfsHVj5/Rtlzi/LaTPcCHjkyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691615; 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=1KHTrB5G+hXP6XNS6Ltv5zSUVrSHFgLXtijbaT8BQro=; b=i9eTMmPxzD75jzpbNHiDOc6hLvWWAFSq3iTnUQWZgcMeny652aIuvDmIwAKg7jsx7Y6HtBbnYOxNSyg5bMG+QGOm1cKEOBtMulud9C0OhCKlULurUPd7mMlvGTib1wRn+fEOYEp+pwTqtULUTn3+P0ab0K64ZqgBUzzAgLa0qkw= 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 1675691615944484.87856530830334; Mon, 6 Feb 2023 05:53:35 -0800 (PST) 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-144-BaRp1leWM_G8YeZEXAfVxQ-1; Mon, 06 Feb 2023 08:53:31 -0500 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 E4F61858F09; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D251F40398A0; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B7D02194658C; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 298CF1946589 for ; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1BD2714171BB; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B1891410F36; Mon, 6 Feb 2023 13:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691615; 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=1KHTrB5G+hXP6XNS6Ltv5zSUVrSHFgLXtijbaT8BQro=; b=LJF9sxZQQNRq1g4Zqwh1T2k1tJ+yuJtw9I3iyz0sZmQQh0sOh0Bwlgz55ET8A7xwKKvxKx iDeS2Rt8BPF11ARhW6e0AhETCQros1qktg//539YgJQLct4lxHLe6f/EHv0Vnv5zhxDCRR NbVdcLyiiQtnxtpUlArrOBz6mmjuTqg= X-MC-Unique: BaRp1leWM_G8YeZEXAfVxQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 08/20] ci: build.sh: Move off of ninja command to directly calling meson Date: Mon, 6 Feb 2023 14:53:05 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691616662100003 Content-Type: text/plain; charset="utf-8"; x-default="true" This change however involves adding a couple of new environment variables as well as tuning the helper script to support local container executions properly. The overall motivation here is to move all script logic from .gitlab-ci.yml to the build.sh script so that the steps are consistent and identical when executing in local containers and GitLab. By adding the new env variables and increasing the granularity in meson commands executed in the script it gives us better options on how to port the existing code from .gitlab-ci.yml to a standalone Bash script. Signed-off-by: Erik Skultety --- ci/Makefile | 11 +++++++---- ci/build.sh | 3 ++- ci/helper | 21 ++++++++++++++------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 8f1be4318d..217eda3cc0 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -162,7 +162,9 @@ CI_ENGINE_ARGS =3D \ --workdir "$(CI_USER_HOME)" \ --env CI_CONT_SRCDIR=3D"$(CI_CONT_SRCDIR)" \ --env MESON_ARGS=3D"$(MESON_ARGS)" \ - --env NINJA_ARGS=3D"$(NINJA_ARGS)" \ + --env MESON_BUILD_ARGS=3D"$(MESON_BUILD_ARGS)" \ + --env MESON_RUN_TEST=3D$(MESON_RUN_TEST) \ + --env MESON_TEST_ARGS=3D"$(MESON_TEST_ARGS)" \ $(CI_PODMAN_ARGS) \ $(CI_PWDB_MOUNTS) \ $(CI_HOME_MOUNTS) \ @@ -209,7 +211,7 @@ ci-build@%: $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build" =20 ci-test@%: - $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_NINJA_ARGS=3Dtest + $(MAKE) -C $(CI_ROOTDIR) ci-build@$* =20 ci-help: @echo @@ -240,6 +242,7 @@ ci-help: @echo " CI_USER_LOGIN=3D - which user should run in the conta= iner (default is $$USER)" @echo " CI_IMAGE_PREFIX=3D - override to prefer a locally built= image, (default is $(CI_IMAGE_PREFIX))" @echo " CI_IMAGE_TAG=3D:latest - optionally use in conjunction with= 'CI_IMAGE_PREFIX'" - @echo " CI_MESON_ARGS=3D - extra arguments passed to meson" - @echo " CI_NINJA_ARGS=3D - extra arguments passed to ninja" + @echo " MESON_ARGS=3D - extra configure arguments passed to m= eson setup" + @echo " MESON_BUILD_ARGS=3D - extra build arguments passed to meson= compile" + @echo " MESON_TEST_ARGS=3D - extra arguments passed to meson test" @echo diff --git a/ci/build.sh b/ci/build.sh index 9489c4ab2f..2a83f756d5 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -11,4 +11,5 @@ export VIR_TEST_DEBUG=3D1 meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 -ninja -C build $NINJA_ARGS +meson compile -C build $MESON_BUILD_ARGS +meson test -C build $MESON_TEST_ARGS diff --git a/ci/helper b/ci/helper index fb562d55e1..7b8f2e6826 100755 --- a/ci/helper +++ b/ci/helper @@ -48,15 +48,21 @@ class Parser: # project's build system mesonparser =3D argparse.ArgumentParser(add_help=3DFalse) mesonparser.add_argument( - "--meson-args", + "--meson-configure-args", default=3D"", - help=3D"additional arguments passed to meson " - "(eg --meson-args=3D'-Dopt1=3Denabled -Dopt2=3Ddisabled')= ", + help=3D"additional arguments passed to meson setup" + "(eg --meson-configure-args=3D'-Dopt1=3Denabled -Dopt2=3D= disabled')", ) mesonparser.add_argument( - "--ninja-args", + "--meson-build-args", default=3D"", - help=3D"additional arguments passed to ninja", + help=3D"additional arguments passed to meson compile" + "(eg --meson-build-args=3D'--clean --jobs N ')", + ) + mesonparser.add_argument( + "--meson-test-args", + default=3D"", + help=3D"additional arguments passed to meson test", ) =20 # Options that are common to actions communicating with a GitLab @@ -152,8 +158,9 @@ class Application: =20 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}", + f"MESON_ARGS=3D{self._args.meson_configure_args}", + f"MESON_BUILD_ARGS=3D{self._args.meson_build_args}", + f"MESON_TEST_ARGS=3D{self._args.meson_test_args}", ]) =20 if pty.spawn(["make"] + args) !=3D 0: --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691631; cv=none; d=zohomail.com; s=zohoarc; b=UlUY3ZcIQIm7AULDopMujrltwSiJmLlZSCmr7ARs6zxq+HyDQZP2k/bW+PL0SAZoe1Mmui/aNhZHZ0kHk8njqdXsbuKXJC9ojrwg9s34gqAOo7bzvlvV9Hj1/OoKSjBhx7lkwiYl/xbKzg6sU7hj0BSGohMivPllUdh8CNFG1Ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691631; 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=FcrtaeoAHrLIj183/J4jLprsqUpt8uee7TeiRTflA1g=; b=lgfZTpAq7nYb/2qLwGS3cJ4DwZdSOawMNJnVbKUyyE4Qt7MLVzd7Fxr4w3UaqYredkzVhF0oyQumA6qFMALrSf272rbb5MNyPnK4S1aEBuqDIEDada1FkZit2EmXzeQeqT0zh+I+IerjvGcp/y/Iiggu8YOoYXY//rdMZ1WcaK4= 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 1675691631832907.5334954377078; Mon, 6 Feb 2023 05:53:51 -0800 (PST) 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-613-xm-FQ3qKOPOB05RMHPzGGA-1; Mon, 06 Feb 2023 08:53:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C51FF85CCEF; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE692C15BAD; Mon, 6 Feb 2023 13:53:29 +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 73BE919465B2; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0265F1946589 for ; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DB8ED1410F36; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5991D1415113; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691630; 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=FcrtaeoAHrLIj183/J4jLprsqUpt8uee7TeiRTflA1g=; b=a5zO+2Cmz5q1KJsv3Vku0x+CoQoDsdwubve5uUBIv7OAZIPIYhRKdLF9w/2lpsOaTJ9OmJ jaZ52VN+Egvm/OtF2HrdDfB2xZ8JKJCy0VYW/F5kPvBDKB/tnYsA39OT6iAGl6eWntylG8 gg3H3QuLX1Tu6Dh9kaVBF/nBCQ168EU= X-MC-Unique: xm-FQ3qKOPOB05RMHPzGGA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 09/20] ci: build.sh: Join MESON_ARGS and MESON_OPTS Date: Mon, 6 Feb 2023 14:53:06 +0100 Message-Id: <95163b72f229133c965cd21737634e3db6084c85.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.8 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: 1675691633660100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It is quite confusing seeing these two in a call like this one: $ meson build $MESON_OPTS $MESON_ARGS One has to ask 'how are they different' and 'shouldn't these be merged'. In fact, these variables hold very different things and we should make it more obvious. The problem is that renaming MESON_OPTS to something more meaningful, like 'MESON_CROSS_OPTS' which is what MESON_OPTS really does would require changes to lcitool and would impact Dockerfile generation which in turn might have an impact on other projects which rely on this lcitool functionality which is risky. Instead, provide a docstring for the former tu supplement the latter and join the two variables in a single one MESON_ARGS which is then passed to meson's command line so it's a little less confusing. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 2a83f756d5..322aff2632 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,8 +7,15 @@ export VIR_TEST_DEBUG=3D1 # $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 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 =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ +MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" + +meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 meson compile -C build $MESON_BUILD_ARGS --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691617; cv=none; d=zohomail.com; s=zohoarc; b=eZuetGS0Z1Od4eYUSRyog4odhx1e40FE0Wd7ASMj/IYlQnjW0VJhMYIba6hzs2WHkwT+81hKULFh2qr0K2IUub33IM2c/vIokiF6SDLpjp2j5pZgNR3NQJ/OldHe+110NxDPwFpseM2kM0tN/MQvFOGE9qCZzZa+Hp5eccvRL1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691617; 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=4QOFE8QJhxBjNMFVEKitCI6LNxkNSMJ9p929eYgIW+k=; b=WxxUcq13RdRlta3IdBCdCqQnxBuHXIQwTMD8ds1fnqzCjABCL36AdWgKXYWCfQb1BbD6+J04ju7nNxGLaIa7tuhmknmlKndxNiI/hZoYaDHsjEkfn5zxvYJjhGM1u8dE/eR9NkuLLXTX1IQl3790pWgI3cXA+4kSnTPlVCKqvg0= 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 1675691617156884.8259158574201; Mon, 6 Feb 2023 05:53:37 -0800 (PST) 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-380-zkC0JcqeN9mF9sEQrwwQtA-1; Mon, 06 Feb 2023 08:53:31 -0500 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 1B09F8027FD; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08B152166B29; Mon, 6 Feb 2023 13:53:28 +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 EE6FD194658C; Mon, 6 Feb 2023 13:53:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C5C861946595 for ; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A8172140EBF6; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24E8C1415126; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691616; 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=4QOFE8QJhxBjNMFVEKitCI6LNxkNSMJ9p929eYgIW+k=; b=euHxo1OoS5UFPhY5TnALnXpU1u8mV37SAgks8Bxnm1p6EUQlaT5QSXLSHEcqsv4/SMOIaK 97wWa+6XfVrX2ZDw8GSQ0tu2dCnqG+Gh3YWpcwyBqXxa7XHRmpnOE559/i4o1ng5bGYB7q eu75eDiStzhVwYGMOdDWrUm/xypnePA= X-MC-Unique: zkC0JcqeN9mF9sEQrwwQtA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 10/20] ci: build.sh: Break the script functionality into helper functions Date: Mon, 6 Feb 2023 14:53:07 +0100 Message-Id: <5e999645e36beb8724ea86e28f36406d57e04ed2.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691618698100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Future patches will add more functions corresponding to the behaviour we define in individual GitLab jobs in .gitlab-ci.yml. This is just a preliminary patch. Signed-off-by: Erik Skultety --- ci/build.sh | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 322aff2632..5faa96e123 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -15,8 +15,23 @@ export VIR_TEST_DEBUG=3D1 =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) +run_meson_setup() { + meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS || \ + (cat build/meson-logs/meson-log.txt && exit 1) +} =20 -meson compile -C build $MESON_BUILD_ARGS -meson test -C build $MESON_TEST_ARGS +run_build() { + meson compile -C build $MESON_BUILD_ARGS +} + +run_test() { + meson test -C build $MESON_TEST_ARGS +} + +main() { + run_meson_setup + run_build + run_test +} + +main "$@" --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691617; cv=none; d=zohomail.com; s=zohoarc; b=Xy/st5o/Ah6UEgYqIHFZXPKZrSi/Q8JUBubbUFSw0GEvTvNLh4tJueCoRoWPWl1quymq1biy/s/t87kSDY+t7zNMsN0Z0vQybTHQXQDGpIJcFLydjVbKsgn2xNmabUVDVKr5oa76DJpH9SLqDt3XmJHWbVDsa+7IeIph8GD4J0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691617; 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=Z46Wt4znwZap1x42pT68YDL/JXJqqh3efsXEryI+Zq8=; b=e/MMLT2foYwUIZzKLYXN3M1h3aOUrvDp18u1l4CyQbzkbbTmlkFFvWtDGFK8TLi7nUN6sIwfoMHHz1HO1QhaG8Y6mNov46GEBPcu5KBeG24tbha7HzqiF2e/S38zr3OVGVfiWJHi9PnwhT6oAqg497khfd2IvV12Zk+FuyZ7OS0= 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 167569161760379.04830258912773; Mon, 6 Feb 2023 05:53:37 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-394-KarM1kQNNU6T3QE3_UUegA-1; Mon, 06 Feb 2023 08:53:31 -0500 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 4B93A1C06EC6; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3640B14171B6; Mon, 6 Feb 2023 13:53:28 +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 116F819465A3; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8E1671946589 for ; Mon, 6 Feb 2023 13:53:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 73BDA14171B8; Mon, 6 Feb 2023 13:53:27 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E66421410F36; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691616; 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=Z46Wt4znwZap1x42pT68YDL/JXJqqh3efsXEryI+Zq8=; b=PyjYbT/AD7I4h5jba4IaeImhYIdyEccdJ0ZgzDB76xBvUa2WsvU2oHT4ex/llAOP1p01cI IG8I4ozmUJdMhEmAe5D+8sl5FTDs1eYBbU0BhLtUM8/M4JqyIND6vPO84H0p0GqbiHWPVB TCZASQFa4lj4wghg50pPVlEnQzFZJE8= X-MC-Unique: KarM1kQNNU6T3QE3_UUegA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 11/20] ci: build.sh: Move the necessary env variables to build.sh Date: Mon, 6 Feb 2023 14:53:08 +0100 Message-Id: <8d2871365a7d3cdb80d2bc0ba3dca5d287580192.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691618699100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Originally coming from the list in our gitlab-ci.yml. The corresponding gitlab-ci.yml change will come in a future patch. Signed-off-by: Erik Skultety --- ci/build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 5faa96e123..15c157067b 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,9 +1,14 @@ #!/bin/sh =20 +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" + cd "$CI_CONT_SRCDIR" =20 -export VIR_TEST_DEBUG=3D1 - # $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.39.1 From nobody Sun May 19 03:38:28 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=1675691619; cv=none; d=zohomail.com; s=zohoarc; b=A1R16KCsD/NPvHsIjxe7exzEe5j8/uN881rT5vDBEoBPCVLNFSyAnPd7dfBRfPoGTmUrddc+MEmlMZo2Or0H1Mr3mYegPcaZR0V9z66O4lW67VOPPMK/Xyx6IRRVHgtyn+TY5aBXQ7idE0w7NMCjSUu/Ex5hRRy6C96VWh91Usg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691619; 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=XTcbYu1hLx8g6v3FiNEzLwhgLjSF4I2LYZ8Y6FgL4ls=; b=PpJIW6GsaLyQ9RdySvoHAJxL/WesszN7GeuzgOURD6PHSM/H1HDqauPQKRLuyXGD/Oih4+Wz0/0y+Utk9GTHZ5Bcqjs4bKnt2BcUzqXFBK1gDf3/FNfeyX9IIp7qhUwOObeh0TXGnsz4lqy0fzi80DuJx5TNWXC1e4ogMKOd7XI= 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 167569161944768.32668439317297; Mon, 6 Feb 2023 05:53:39 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-nYFL1KDnNW6MiE1uMMQqsQ-1; Mon, 06 Feb 2023 08:53:34 -0500 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 6EA8E3C0F669; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B80540398A2; Mon, 6 Feb 2023 13:53:29 +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 3D98F194658D; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5BCF21946594 for ; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 41F621410F36; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id B311C140EBF6; Mon, 6 Feb 2023 13:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691618; 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=XTcbYu1hLx8g6v3FiNEzLwhgLjSF4I2LYZ8Y6FgL4ls=; b=D4Y8sVE44Wk3AlmZ3uLyv06vzXnH0f3+05V31Ze8Cc83w4rayCLVMe7aClWObMWHOvlEgW sDr0KIXATCNMfSNXAOoLF72JkAn+4HTH2fB3RldZ1krbR/yetNBf6WS2FXy30bMmP2f/WB vk3rZkW3e4Moc3MuHCZ8ijV793LrPDc= X-MC-Unique: nYFL1KDnNW6MiE1uMMQqsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 12/20] ci: build.sh: Add support for individual GitLab jobs Date: Mon, 6 Feb 2023 14:53:09 +0100 Message-Id: <3932852939a9e3deb6d9805320165762215bc360.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691620731100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduce more helper functions corresponding to the jobs we currently run for container workloads in GitLab. Some of the variables used in the functions have to provide default values identical to the options we pass to the jobs in GitLab to match the same behaviour if not overriden by the user on the CLI when the local container execution is used. Signed-off-by: Erik Skultety --- ci/build.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index 15c157067b..f169dd01a1 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -29,10 +29,41 @@ run_build() { meson compile -C build $MESON_BUILD_ARGS } =20 +run_dist() { + meson dist -C build --no-tests +} + run_test() { meson test -C build $MESON_TEST_ARGS } =20 +run_codestyle() { + MESON_BUILD_ARGS=3D${MESON_BUILD_ARGS:=3D"libvirt-pot-dep"} + MESON_TEST_ARGS=3D${MESON_TEST_ARGS:=3D"--suite syntax-check \ + --no-rebuild \ + --print-errorlogs"} + run_build + run_test +} + +run_potfile() { + MESON_BUILD_ARGS=3D${MESON_BUILD_ARGS:=3D"libvirt-pot-dep libvirt-pot"} + run_build +} + +run_rpmbuild() { + run_dist + rpmbuild --clean \ + --nodeps \ + --define "_without_mingw 1" \ + -ta build/meson-dist/libvirt-*.tar.xz +} + +run_website_build() { + MESON_BUILD_ARGS=3D${MESON_BUILD_ARGS:=3D"install-web"} + DESTDIR=3D$(pwd)/install run_build +} + main() { run_meson_setup run_build --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691621; cv=none; d=zohomail.com; s=zohoarc; b=O/QnXKSPgNrDTfYwoRGwI8tcVmvBmkoXtqTyBXeIRKO8owXIjB0ZZqSNJfSfjUnoEpTKsu7FcK5VR+O/+MhTsgCKJlp4EUM4+SzLs6sQ/UDR2u5YVOD6Gf3m+DIgMb2pmQ34eBMtIaEPU5LW9yXuqNGJO3Aj9QPzweZH/yv9VZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691621; 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=JV40pYU06GHXZylEibLDnZdmSnAZW2IzLv4cWtER3Wo=; b=hfEtHmuzkT3IARQTgiGTblqJu5bIUlGd/kc7Y7PUkjI0r+vUmWPqVgBCq4mcRAOFMznDy7ByLtnnkUxrL0gABDIzielsgucAwGfR6+0JrIuCmXzefR9LeLgqcJ62A4ZlUh6fUhdY/hXryVHqzyqeC6NgggBQL6GomhegdO9fbtY= 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 16756916213122.4082552158034787; Mon, 6 Feb 2023 05:53:41 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-QRTibMNhN7-RPM7GFjm2fQ-1; Mon, 06 Feb 2023 08:53:37 -0500 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 7C5933C0F66B; Mon, 6 Feb 2023 13:53:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6753D440BC; Mon, 6 Feb 2023 13:53:30 +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 5719A194658C; Mon, 6 Feb 2023 13:53:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B6F01946589 for ; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1127F14171B6; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8323A14171BE; Mon, 6 Feb 2023 13:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691620; 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=JV40pYU06GHXZylEibLDnZdmSnAZW2IzLv4cWtER3Wo=; b=ZEd5M+cs7OAXJWu0akYz/YdvrjBtlAzWoJOs+DkZXvvyn/+1LxOKGuId0SFKKTgy0nXI2h itOtr+x4JgiVcGzSAV7QaXsV84m0HItd23N5ky0um00MWSs/1smpXYtdq/4J4Eu2Dvqd0W cwQA98zyFYv9YFeDn7m5WpuOo6JmL/o= X-MC-Unique: QRTibMNhN7-RPM7GFjm2fQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 13/20] ci: build.sh: Wire up the individual job functions to the CLI Date: Mon, 6 Feb 2023 14:53:10 +0100 Message-Id: <085c059db9cf7201b34bf43552c732621ea405da.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691622727100016 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we have the GitLab job helper functions in place, we can wire them up to the CLI interface. Signed-off-by: Erik Skultety --- ci/Makefile | 5 ++--- ci/build.sh | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 217eda3cc0..8525b2ff88 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -208,11 +208,10 @@ ci-shell@%: $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"/bin/bash" =20 ci-build@%: - $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build" + $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build --build" =20 ci-test@%: - $(MAKE) -C $(CI_ROOTDIR) ci-build@$* - + $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND=3D"$(CI_USER_HOME)/= build --build --test" ci-help: @echo @echo diff --git a/ci/build.sh b/ci/build.sh index f169dd01a1..aeb1bf4b05 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -65,9 +65,44 @@ run_website_build() { } =20 main() { + ACTIONS=3D"" + + while [ "$#" -ne 0 ] + do + case "$1" in + --build) + ACTIONS=3D"$ACTIONS run_build" + ;; + --potfile) + ACTIONS=3D"$ACTIONS run_potfile" + ;; + --codestyle) + ACTIONS=3D"$ACTIONS run_codestyle" + ;; + --rpmbuild) + ACTIONS=3D"$ACTIONS run_rpmbuild" + ;; + --test) + ACTIONS=3D"$ACTIONS run_test" + ;; + --website) + ACTIONS=3D"$ACTIONS run_website_build" + ;; + *) + echo "Error: Unknown action '$1'" + exit 1 + ;; + esac + shift + done + + ACTIONS=3D${ACTIONS:=3Drun_build} + run_meson_setup - run_build - run_test + for action in $ACTIONS + do + $action + done } =20 main "$@" --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691655; cv=none; d=zohomail.com; s=zohoarc; b=L+eMDsCkrkQ7CmsaUuBG5bCzEBrH9TK4omF0sKkV7KaHzsOzW0/QB0jMTbqJxqKjxMWZir1UblarvXnCxoDrbrZUFE7SFnnbpEUcJw+s5xxbUDC69GThX9a+cSS6YFBfZ+k1s4TJS9R+qvLl4OOUHTmsIS7gKHGM25dno8xuKxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691655; 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=ElX3SueIhXNUoAwQ/1ZM8tWEYadAl8RXF5u1uSiqFYg=; b=AMs56NjKOBpaa2moxBU1XO+YT/GPNtyDl04DyKs4vnTMJLwZEeO0wxoj0H6VyUXALVzPNno0TsH32aEsP5hL08YRS0y0kEmuiSAaVfaap9l/cRIZ4wMdl7JR3Dlcr0MaWiahKxddFVCDAzz3CIcQitD5EPrv9KkBZT9ZRM/7Bog= 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 1675691655958298.4314416198356; Mon, 6 Feb 2023 05:54:15 -0800 (PST) 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-12-LPiq_BoyNVyAJGpqvlhxaA-1; Mon, 06 Feb 2023 08:53:38 -0500 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 CFED085CCE3; Mon, 6 Feb 2023 13:53:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B822340398A0; Mon, 6 Feb 2023 13:53:31 +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 A8C94194658C; Mon, 6 Feb 2023 13:53:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E873B194658C for ; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D58F21415303; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 507A3140EBF6; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691655; 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=ElX3SueIhXNUoAwQ/1ZM8tWEYadAl8RXF5u1uSiqFYg=; b=SNM/+/0MsguKjit0hQkWWIAe23ip7qY7PjvLCA7akDmN95xP0TUJCgMCBVYdElCB+8NJXz 2bgb0cHGQPbPJWA7oe4Uj0bBXLKmZMTR+OxUkhs6Ondbz3D8BrlPzTw3tRffqGF6hH1uw6 orukt0wdbaCIW0qe2powkdz72VA6ouo= X-MC-Unique: LPiq_BoyNVyAJGpqvlhxaA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 14/20] ci: build.sh: Document CI_CONT_SRCDIR Date: Mon, 6 Feb 2023 14:53:11 +0100 Message-Id: <4bb92660f46a1dd8c19352478c00484da5632e68.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691657724100007 Content-Type: text/plain; charset="utf-8"; x-default="true" This variable is specific to local container execution and is a result of the hierarchy we chose for local container executions: $ ls build libvirt # build is the script, libvirt is a repo clone The variable would never be populated in GitLab environment, so we set the default to $PWD to make it harmless in such a case. Signed-off-by: Erik Skultety --- ci/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index aeb1bf4b05..4d7ef810f2 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,7 +7,10 @@ export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" export VIR_TEST_VERBOSE=3D"1" export VIR_TEST_DEBUG=3D"1" =20 -cd "$CI_CONT_SRCDIR" +# CI_CONT_SRCDIR will only ever be set in local container executions. For +# GitLab CI environment the variable defaults to $PWD to avoid any disrupt= ions +# in the expected environment view. +cd "${CI_CONT_SRCDIR:=3D$PWD}" =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.39.1 From nobody Sun May 19 03:38:28 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=1675691624; cv=none; d=zohomail.com; s=zohoarc; b=XYqIxfmAInYzRk6FI5x5sg9ghl9WEolOIa9Vbp71u1U4yzOQ4toiq0JAFWYB+by0Nf75RIHf2PuwHKtcOJGoUhBrEXj9PcnQK+Skamt1e07J5KHy6UIkD/pfXSahSEh3r2TAds+Eg4FzuyV9OSje3HWUWt/u0T3TQkXFBJ2yoTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691624; 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=wJMRJosiIzaLVfkc91TdkKV+Q0Si+Jmi+N6u6bhyiPQ=; b=ZyDZ/WV20cKLuTsomEdiKS/m5EholfMHJUC08ozBmrPLp0rdcCn008kHdL6uj/zR71OI0WeCouj6xOdOYduyUc1qpT03d99lKUDkZQAugywqzN1V4RD8epYYm+uYAkck8MvQhmLL61CgnPNeNua8STSCHpZbikHZMotKq9yKDhc= 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 1675691624270857.7050846855985; Mon, 6 Feb 2023 05:53:44 -0800 (PST) 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-29-6XSdTP_EOBiNNRWMy2SZSg-1; Mon, 06 Feb 2023 08:53:39 -0500 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 14226802DD4; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 006DB492C3C; Mon, 6 Feb 2023 13:53:33 +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 E7F95194658D; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BB4F51946589 for ; Mon, 6 Feb 2023 13:53:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A081D14171B8; Mon, 6 Feb 2023 13:53:30 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E6D7140EBF6; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691623; 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=wJMRJosiIzaLVfkc91TdkKV+Q0Si+Jmi+N6u6bhyiPQ=; b=KchMujoFVfWLVNgBlP5+Dv5fkpRoPyfee0nUMZuDwvkFUvkGVYDP7aW+o3iM4+rGRFnHrb KRwkZm8etO3Rdllhhft+xi1Wu0ObsFn/lgLfYlUWwCn7xwdhglGwjE6Ujltcqs/NxjW8FE L+5Ys67Zo/WZy2dR8qw5EO/QuiBKmqU= X-MC-Unique: 6XSdTP_EOBiNNRWMy2SZSg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 15/20] ci: build.sh: Make the build script fail ASAP with 'set -e' Date: Mon, 6 Feb 2023 14:53:12 +0100 Message-Id: <4614584632511eab1b690a2f826e6900844a4a3b.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691624754100019 Content-Type: text/plain; charset="utf-8"; x-default="true" This is the default setting in GitLab container environments and it makes sense to stop executing the script with the first error encountered. Signed-off-by: Erik Skultety --- ci/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build.sh b/ci/build.sh index 4d7ef810f2..b6596300be 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -69,6 +69,7 @@ run_website_build() { =20 main() { ACTIONS=3D"" + set -e =20 while [ "$#" -ne 0 ] do --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691629; cv=none; d=zohomail.com; s=zohoarc; b=N5ZDo/D1gQgtPoihkG9c7C7t8It/W1ORm7QoGIpvzu2WRhkibxK/XaPUJOa2WUMyNiPxyIIrTtaGawXay4mc1j10hbDAPRmlnn25tAxSx5KGgxIZz0LA8v2UQHsWYEid8zrKM8SSSJ5vFF0PcUrZHXbPUCPzW+wdfOQV7c471wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691629; 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=dTYUtDUvF82pUxOZ1RefsyOCbJnmkAITkU3jPV2OqZE=; b=f7oN+AAZ+L6ELnlVeJ31mrMntyk9sEwt5Oz6WuJc2Yz3k/Y/CMUzLkPww97B7ztK9WLzCg7z2+sd7OFI/LlN6u2CN/hVa9h0QDEcrtJE4dSVBpUtXn0oBoAH8PM3ramNMTCLoWooR1U2rrGYW/5iAUdVHZmOmJxlC1KMXltNUZU= 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 1675691629039209.89034165436533; Mon, 6 Feb 2023 05:53:49 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-60-Bza0RKnxM6yW3nfLSMlXmg-1; Mon, 06 Feb 2023 08:53:41 -0500 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 AE6392A5957B; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A179492C3F; Mon, 6 Feb 2023 13:53:32 +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 908F1194658C; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7B8281946589 for ; Mon, 6 Feb 2023 13:53:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6E29414171B6; Mon, 6 Feb 2023 13:53:31 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEC6A140EBF6; Mon, 6 Feb 2023 13:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691628; 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=dTYUtDUvF82pUxOZ1RefsyOCbJnmkAITkU3jPV2OqZE=; b=UlDy7x/5y38urX5VJm1/kNl+b9DM9eZg1TIClAihm5ElcK9xkQzUewhKFlmYyTngJA9MAI 5njRyTARRj0uAwb8J8rUr0+FdgsOnf9g7tGHsQVYKhZsdOhIehBGLs396OIxApskrFdV7z xrS9Y9qD2oN1sKp3a1SXpqN2KKZSmAY= X-MC-Unique: Bza0RKnxM6yW3nfLSMlXmg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 16/20] ci: build.sh: Update git index in local container environments on 'dist' Date: Mon, 6 Feb 2023 14:53:13 +0100 Message-Id: <80dc3fcab83231f51193e921a5be06b5b29b91ca.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691630788100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Meson dist build is unhappy with the git clone we mount into local container environments and forces updating git's index. Since this is only relevant to the dist build, only update the index then. Signed-off-by: Erik Skultety --- Honestly I have no good explanation why dist kept complaining about uncommi= tted changes even though there weren't any. It probably has something to do with the fact how git clone --local works, but I don't see why - an option would= be to convert to using '--no-hardlinks'. Anyhow, 'update-index --refresh' was = the only thing that helped to solve the problem so that the dist tarball could be created inside a container locally followed by an RPM build. ci/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/build.sh b/ci/build.sh index b6596300be..6731db50c1 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -33,6 +33,10 @@ run_build() { } =20 run_dist() { + # 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 meson dist -C build --no-tests } =20 --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691669; cv=none; d=zohomail.com; s=zohoarc; b=d/BU9p/bdpFTPee1hF226k9MGNfXGYB8ATm60lclukPrj5D8C1cwOzRR4b6gQQ3jLTX7G4DCm03f6r7KOWZPK8M+mXoa0iD7p5uNMqKYux6VqqlxaIPoUqn+GFMSIo6lqe6UfIiOosVLhUH/CAxbLSZND2MHZIvQ0Bcolr1Wess= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691669; 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=eQD2D7APnGDQJ/30oBX9vdesP6YzJW4IknojPfycphE=; b=JQqCihKORDquOmGsgxmhylA+GkuoiAQCaeR9HBWB3u9mD1rUbzuAGZ85nS4a1EIETMUQv2v5KW3Cu6RP27VR7azW/fENC6soOAqrUNPyDFX8s1l3rFUCNTES/j+Nq7IsI4jLSa85XV7qjv2NOax+w5vSuJ5VxubLvTUxvdsA3gs= 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 1675691669053501.46758305100263; Mon, 6 Feb 2023 05:54:29 -0800 (PST) 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-151-YkOG5cyDPDagCB1MrPSzog-1; Mon, 06 Feb 2023 08:53:39 -0500 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 E8AB6100F922; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D243A492B21; Mon, 6 Feb 2023 13:53:33 +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 C8530194658C; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 46A721946589 for ; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3B67414171BE; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC903140EBF6; Mon, 6 Feb 2023 13:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691666; 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=eQD2D7APnGDQJ/30oBX9vdesP6YzJW4IknojPfycphE=; b=dUS/5q4gbINevPlQeS/6oilmJdW8PQtJGiwH8bToD5W9WZstXQGNuKIOz/NXIz+UKH8w+k 2ZgQbePuOxx50aekqOLfbmYxvXKHVQL8fyCPTWuSH+HWTmqpEEt9KKsXGzprHY1+NkXDde eZGAAud0EXvAi3Qlmughb9i558O63XQ= X-MC-Unique: YkOG5cyDPDagCB1MrPSzog-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 17/20] ci: build.sh: Make the script executable Date: Mon, 6 Feb 2023 14:53:14 +0100 Message-Id: <6c8573f2c13589a9e009f15c1c5b696dceb74877.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691669754100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Unless we run it as 'sh ci/build.sh' in .gitlab-ci.yml recipes and instead opt into doing 'chmod +x && ci/build.sh' it will cause meson dist build to fail with a fatal error about having uncommitted changes in the repo. Therefore, let's just make the script executable, it's the most straightforward solution. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 =3D> 100755 ci/build.sh diff --git a/ci/build.sh b/ci/build.sh old mode 100644 new mode 100755 --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691625; cv=none; d=zohomail.com; s=zohoarc; b=hqHAaeytKvbSQmNSmx0B2/HPlGaScJ4qENKA7czm0jysjuk4gALuLkRAc1SLg5NcmiOM1NEA6Z0n7ObCvp7RWwR9zxfZKqErMA1VhSp5sui2UBAypIpAZM7KaXs08zHh6FjIdhewKYypmY/8PGDAuRSDBk8Bp6oWgpbNn2dKCaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691625; 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=jpVdh8HpAeP+o+PJblAlFHGajKexZKB5qRQkvMTCm9o=; b=N2elNAKTcQxzpiOlujZnJW2QwpUYLspCvi2BvdPAnAGm1Qx8KYBd0VKMbh+IAeFa79jzsynWaaX1MF77kKeFpW7yQjbExXMqRhn9km027Dx3CpRUcOe2/zCKnPWhLRmDXvRv+JqeXgGuc6/Ig4tbv+8EBNzSOXFl6L1apc3QoCg= 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 1675691625746834.1159642628123; Mon, 6 Feb 2023 05:53:45 -0800 (PST) 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-363-jAo6CAlxNXaPJSmgLGZ_sA-1; Mon, 06 Feb 2023 08:53:39 -0500 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 2C92185A5A3; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 193C01410F36; Mon, 6 Feb 2023 13:53:35 +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 09FC7194658C; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2344319465B1 for ; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 07F3B14171BA; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79B15140EBF6; Mon, 6 Feb 2023 13:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691622; 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=jpVdh8HpAeP+o+PJblAlFHGajKexZKB5qRQkvMTCm9o=; b=Y4q0rS0rPEwgCN3UfJcWyUr94y4Vo8zW5zmh6bB55NaXYmun7YAm6IsfFntK4p2Z6glKD5 8XY+m8Eo24+Rb/GAyv3qkZ2GF322Cnd2EzOjIoNkL0JG2VOucB7r4MezLg/DTWamGsF8YN 9PVzf9EBD5Ia1Vuv1Hd0Tp0YePPDqcY= X-MC-Unique: jAo6CAlxNXaPJSmgLGZ_sA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 18/20] gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection Date: Mon, 6 Feb 2023 14:53:15 +0100 Message-Id: <0b6e539d6ad9e44541fb1585e29624b12fcf36ba.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691626784100021 Content-Type: text/plain; charset="utf-8"; x-default="true" This would otherwise collide with local 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 Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 921b04cd7b..abd7498058 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' @@ -154,6 +161,8 @@ potfile: script: - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - meson compile -C build libvirt-pot-dep libvirt-pot + after_script: + - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile' --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691652; cv=none; d=zohomail.com; s=zohoarc; b=EiWKJ9Dh+6Ls45+MrQMHNQlPlnAHrWoAH4JbteyWKfLDaIoO7j7BsK7lf0bzMcQPZxisf7V7H1jHX8SF5yp7s0EKKgDwD1W45zyMA0m1AlDvWdgAcQOEohHGizUAwZZYSBF7nq34XMfYq4LbM8pW9W/oYvGIU+Tm32BAc0XtmFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691652; 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=aXiauIzXDMyOcCj6lbEwLIYl9+Ql5gJWcHmin2Ayd3A=; b=QXtmgMW4wDcFWiSQPav8UeCvq4hNwMO/C6iiBO6Pnu0vR2KpPqeUHfW5dqI+R54oJHQ1SMr2WSNHsDMzxSi221yblxQgogIii6LJwR06SLTUBIPQnjnrdJUeqwpxuxZvZeMpvoaRiaU4uYG/d++5JwXLxvHQEBhZBBwwIpYZi6k= 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 1675691652612263.27816872830215; Mon, 6 Feb 2023 05:54:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-600-ej9KuRqZO4qzbEPWbaoUNA-1; Mon, 06 Feb 2023 08:53:39 -0500 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 62A303C10223; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE3A2166B2A; Mon, 6 Feb 2023 13:53:36 +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 3E9DA19465A0; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C568B194658D for ; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A97631410F36; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25E4C14171C2; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691651; 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=aXiauIzXDMyOcCj6lbEwLIYl9+Ql5gJWcHmin2Ayd3A=; b=Xw9/eYjVLL2zp4n/plXRtk4WGcFtrs8WFz4IrUQvGyClc9q/z4r7Eo0MVHdXy3g8OVFJgu 6gnaQxG6qyJ/4N6wU4ICE2eQTJYqd5UmFwci0c8EcRXYgZaZWotFd6W8nnb0ETSHuKgokC O4xrWAzRiUT+PNQJ/gy1p9W1rI5PcJY= X-MC-Unique: ej9KuRqZO4qzbEPWbaoUNA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 19/20] gitlab-ci.yml: Adopt job execution via a Bash script Date: Mon, 6 Feb 2023 14:53:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691653716100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Instead of open-coding the script steps like we've done until now, use a shell script. Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abd7498058..747209dca9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,14 +26,11 @@ include: 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 - 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; + ci/build.sh --rpmbuild; else - meson compile -C build; - meson test -C build --no-suite syntax-check --print-errorlogs; + ci/build.sh --build --test; fi after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; @@ -41,6 +38,8 @@ include: then mv "$HOME"/rpmbuild/RPMS/x86_64/ libvirt-rpms/; fi + variables: + MESON_TEST_ARGS: --no-suite syntax-check --print-errorlogs =20 .native_build_job_prebuilt_env: extends: @@ -59,9 +58,14 @@ include: 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 + - ci/build.sh --build + - if test "$CROSS" =3D "i686" ; + then + ci/build.sh --test; + fi + variables: + MESON_TEST_ARGS: --no-suite syntax-check --print-errorlogs + =20 .cross_build_job_prebuilt_env: extends: @@ -80,8 +84,7 @@ include: .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 + - ci/build.sh --website after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - mv install/usr/share/doc/libvirt/html/ website @@ -116,9 +119,7 @@ website_local_env: 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 + - ci/build.sh --codestyle =20 codestyle_prebuilt_env: extends: @@ -159,8 +160,7 @@ 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 libvirt-pot + - ci/build.sh --potfile after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - cp po/libvirt.pot libvirt.pot --=20 2.39.1 From nobody Sun May 19 03:38:28 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=1675691705; cv=none; d=zohomail.com; s=zohoarc; b=Miz/MDUww+iAKTfDyobsXCHxlL0kR5njzg1yIyRm9EBwkreJeP922xmBNZO31VLl5/XzikRGs98pog2bb/PVakHNZRkPGImf99DrdVBs9hAYuSsg9ItffEgSmVs7v3YRYLVa7F9fzEgR6xkxkc0i8LTIvCAWC/UhRzoVwLDScDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691705; 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=RL+2tKAEc9GegeAIjVcBvhkJFxkhepcIdbY67Ee/dXw=; b=Orzofrhj7OvpemoufIliACxA/yUkP4j3jCr9AEcYuglqM9QHDV58U1IVWO9uiKGB8w/Aw5PNjLi7gv/8tYbp6Iq2aVZgXWoOY/T9jX1J8TGPm9e9Lwb+TUGhrYUkQgonJqa+cOS4inh/5r2PxEqRbqGgbVStCyA5N2kumRCKcLI= 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 1675691705437184.5295975425579; Mon, 6 Feb 2023 05:55:05 -0800 (PST) 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-636-bPaMr8rYO92Xa5zslANd8Q-1; Mon, 06 Feb 2023 08:53:39 -0500 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 96ED8857A93; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D5062166B29; Mon, 6 Feb 2023 13:53:36 +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 4187E19465A8; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87AE0194658F for ; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 75F6F14171C4; Mon, 6 Feb 2023 13:53:35 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E68BF140EBF6; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691704; 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=RL+2tKAEc9GegeAIjVcBvhkJFxkhepcIdbY67Ee/dXw=; b=Z/zyto1xbZg+WCLwKpvZaljWzkbJhcV3scV3hFsUKHTPoU3qt/ogrWci8qclqqRwQ5SeA4 9G47ESy9evvAOZQA/ngswgTbBJpbWaP5UWh2pDpqDm0aKEky31FBT4+dF8l2qYpHwr+uxK U5fspPt2Iowp5xKqHoJjNqQlKbSqKzI= X-MC-Unique: bPaMr8rYO92Xa5zslANd8Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 20/20] gitlab-ci.yml: Drop the usage of script variables reference Date: Mon, 6 Feb 2023 14:53:17 +0100 Message-Id: <0c9039dd04d5dbb10b389bdc59bb6447228b3fb6.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1675691705929100001 Content-Type: text/plain; charset="utf-8"; x-default="true" ci/build.sh is already exporting all of those and there's no need for these variables to necessarily be defined and exported by GitLab explicitly, this can be transparent to the job definition plus it keeps everything important in a single place. Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747209dca9..7cbccb5fe6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,14 +7,6 @@ stages: - integration_tests - sanity_checks =20 -.script_variables: &script_variables | - 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" - include: - '/ci/gitlab.yml' - '/ci/integration.yml' @@ -25,7 +17,6 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then ci/build.sh --rpmbuild; @@ -57,7 +48,6 @@ include: - ccache/ key: "$CI_JOB_NAME" script: - - *script_variables - ci/build.sh --build - if test "$CROSS" =3D "i686" ; then @@ -83,7 +73,6 @@ include: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite .website_job: script: - - *script_variables - ci/build.sh --website after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; @@ -118,7 +107,6 @@ website_local_env: .codestyle_job: stage: sanity_checks script: - - *script_variables - ci/build.sh --codestyle =20 codestyle_prebuilt_env: @@ -157,8 +145,6 @@ potfile: - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' when: on_success - when: never - before_script: - - *script_variables script: - ci/build.sh --potfile after_script: --=20 2.39.1