From nobody Tue May 7 05:04:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613391183; cv=none; d=zohomail.com; s=zohoarc; b=XBsTnVcoR2cJV9Uo1MW8eKcxudjVf6n7ilquboYkg5hAve8jq9kJi+uxWwQgcQJpqJwsApJ5hwnayJTRLJP6olNM+eSzkgGdGdg5EDbSp7uHi0Z7lmeuVmmkRxmGvbZxbjLts+GWQ8yMWJo9dL9lEV8I9RYQ5GaXmwJy7N82mY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613391183; 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=iaaoPGFeOhVUCxjZ70S5DyVuPlzfZ732mZnLJp02B5U=; b=WUvx0WCJLbB2AWYf8148QO10cgySqwrS/izQ8CkwerBJvoaR0GkAJjI49j0UrsiVOCoqYH5/63d+XsXgzpVbrKq4HNmkJFUD205ABYqo1u9dRY3bXcEoN2DYDfle42C08z7IXhQaPmLme67JX/z0yHFUuNJhh+vLY+k8+Lv2SCY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613391183707634.8195987518714; Mon, 15 Feb 2021 04:13:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-oZUwHd_cMWCE1dd01qZQ6g-1; Mon, 15 Feb 2021 07:12:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8BD21E561; Mon, 15 Feb 2021 12:11:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A495760C66; Mon, 15 Feb 2021 12:11:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5CB8885C5; Mon, 15 Feb 2021 12:11:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11FCBtCm030821 for ; Mon, 15 Feb 2021 07:11:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id D13045C3F8; Mon, 15 Feb 2021 12:11:55 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CA885C541; Mon, 15 Feb 2021 12:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613391128; 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=iaaoPGFeOhVUCxjZ70S5DyVuPlzfZ732mZnLJp02B5U=; b=RZpd5ew+I7Pwe3v9fh6aAaGmhz8uHqKOnr0j7n7Hm617RIpfyXYizvvyIdg+F5K72S5rXH OSAVaWFBZaN5tzKx8JX/I4hDnTJyYZrPVNYEHF/C7z3pAbRCQOqmJFTgGKHP7IilVzoqsC OIdupciKxeJo+Yrxut6Vunaigav5dDw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613391183; 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=iaaoPGFeOhVUCxjZ70S5DyVuPlzfZ732mZnLJp02B5U=; b=cu4KsXtC84Qfa+IwmR9+1yytV24irem5e3AZO5j6IE7KhFHuwwJRMdjQFDi0O5DaXTQXZ9 he3X/ARjtwqZdJ1J2pdI7rHDyM2EIFD9VlTljsQWjtKJO4Kj6fVADl2TkEToeWgYls0xA4 tC0eUPUUVVu0GF1SxlRmkGQpT1aoNXw= X-MC-Unique: oZUwHd_cMWCE1dd01qZQ6g-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] ci: Drop the CI_PREPARE_SCRIPT variable Date: Mon, 15 Feb 2021 13:11:49 +0100 Message-Id: <17a89389bd7c6433e5b0ee944f4ad8b1f1801053.1613391105.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In commit 321293e2 I dropped the prepare.sh script, but forgot to remove the corresponding variable from the Makefile. Signed-off-by: Erik Skultety Reviewed-by: Andrea Bolognani --- ci/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 7bbff3e9aa..94a4bf62c7 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -20,9 +20,6 @@ CI_HOST_SRCDIR =3D $(CI_SCRATCHDIR)/src # the $(CI_HOST_SRCDIR) directory from the host CI_CONT_SRCDIR =3D $(CI_USER_HOME)/libvirt =20 -# Script containing environment preparation steps -CI_PREPARE_SCRIPT =3D $(CI_ROOTDIR)/prepare.sh - # Script containing build instructions CI_BUILD_SCRIPT =3D $(CI_ROOTDIR)/build.sh =20 --=20 2.29.2 From nobody Tue May 7 05:04:50 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=1613391131; cv=none; d=zohomail.com; s=zohoarc; b=apRlEW3+rFyphicC2cw9dPtVsRaiq2kEWoxAxKlU8Q+HYs/rmn6/GL51g4AjB3n2RNLhhB0DF00Gf80h/a76wyQvyzJgr+izf/2BS4p2+I8OHrikM8Ylv6yx2oZU+lzR9JH4bo9+VJMVNxNb/jzsSYtOToU89ECRr5rxQgLeWP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613391131; 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=5Ntrtop3LjtRfLkEausVH5wox6jdYMcqrq1LG+FCW2c=; b=XKU9nzhTrbzgqJL0lBqtoNeY25aKx2T+X6Q/h3ETXiyp5+FQYbNLSzbfo8/W09kroYVfpGg9uEQCHkGS8U+qSC/CI90Imd/IR96rLaN8Nc5iMbwQNX3UBaG8zCXBZup3kDXoLj7rmgUQWNPafvtX0otMknWjd+u9dYPOBAiceV8= 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) header.from= 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 1613391130796485.5695833194585; Mon, 15 Feb 2021 04:12:10 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-ZSqtI3TBPvWzhGsAJ4FM1w-1; Mon, 15 Feb 2021 07:12:05 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 097A01005501; Mon, 15 Feb 2021 12:12:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9E4660CEF; Mon, 15 Feb 2021 12:11:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8392D50033; Mon, 15 Feb 2021 12:11:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11FCBu9U030828 for ; Mon, 15 Feb 2021 07:11:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id D21085C3F8; Mon, 15 Feb 2021 12:11:56 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.192.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D8145C5DF; Mon, 15 Feb 2021 12:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613391129; 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=5Ntrtop3LjtRfLkEausVH5wox6jdYMcqrq1LG+FCW2c=; b=LFM1jLgcHHNQaNHgMd0h6uSo6d1mLyma/k+tb9per2/Avu8Z7BE55fvXAwOm8vAzLlTDyP VdkfXmUDkrgU96DbPvWfzgrSVOB1ZJI6k2HpKaC4SdNYL0NgyhtGjRMIb8/eeZQ3DjZjRD HYYVBfgBOnTj80t38Y36wVbkX/s0/Xk= X-MC-Unique: ZSqtI3TBPvWzhGsAJ4FM1w-1 From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: Makefile: Expose CI_IMAGE_PREFIX and CI_IMAGE_TAG in 'ci-help' Date: Mon, 15 Feb 2021 13:11:50 +0100 Message-Id: <48f774f6ba887036e902298591e869614ca58c93.1613391105.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: eskultet@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Using locally built images is a useful feature; our commentaries even mention overriding them may be useful in some scenarios. Expose the variables in the help to let users know they can use the feature. Formatting would definitely break, so this patch adds more spacing for proper alignment. Signed-off-by: Erik Skultety Reviewed-by: Andrea Bolognani --- ci/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 94a4bf62c7..c4585ae95d 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -235,10 +235,12 @@ ci-help: @echo @echo "Available make variables:" @echo - @echo " CI_CLEAN=3D0 - do not delete '$(CI_SCRATCHDIR)' after= completion" - @echo " CI_REUSE=3D1 - re-use existing '$(CI_SCRATCHDIR)' con= tent" - @echo " CI_ENGINE=3Dauto - container engine to use (podman, docke= r)" - @echo " CI_USER_LOGIN=3D - which user should run in the container= (default is $$USER)" - @echo " CI_MESON_ARGS=3D - extra arguments passed to meson" - @echo " CI_NINJA_ARGS=3D - extra arguments passed to ninja" + @echo " CI_CLEAN=3D0 - do not delete '$(CI_SCRATCHDIR)' a= fter completion" + @echo " CI_REUSE=3D1 - re-use existing '$(CI_SCRATCHDIR)'= content" + @echo " CI_ENGINE=3Dauto - container engine to use (podman, d= ocker)" + @echo " CI_USER_LOGIN=3D - which user should run in the conta= iner (default is $$USER)" + @echo " CI_IMAGE_PREFIX=3D - override to prefer a locally built= image, (default is $(CI_IMAGE_PREFIX))" + @echo " CI_IMAGE_TAG=3D:latest - optionally use in conjunction with= 'CI_IMAGE_PREFIX'" + @echo " CI_MESON_ARGS=3D - extra arguments passed to meson" + @echo " CI_NINJA_ARGS=3D - extra arguments passed to ninja" @echo --=20 2.29.2