From nobody Sat Jul 5 15:35:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509090521065385.8478224513623; Fri, 27 Oct 2017 00:48:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B185D13A82; Fri, 27 Oct 2017 07:48:39 +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 8EBD1600C0; Fri, 27 Oct 2017 07:48:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5B0CB6EF27; Fri, 27 Oct 2017 07:48:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9R7mbh6013434 for ; Fri, 27 Oct 2017 03:48:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C8055CC29; Fri, 27 Oct 2017 07:48:37 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33F455CC28 for ; Fri, 27 Oct 2017 07:48:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B185D13A82 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 27 Oct 2017 09:48:14 +0200 Message-Id: <20171027074815.19958-5-abologna@redhat.com> In-Reply-To: <20171027074815.19958-1-abologna@redhat.com> References: <20171027074815.19958-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 4/5] jobs: Define $OSINFO_SYSTEM_DIR in default make_env 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 27 Oct 2017 07:48:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Althought the environment variable is only used when building libosinfo, there is no harm in having it set in the environment at all times; moreover, hoisting it to the default make_env allows us to remove duplicated code used to set $MAKE in the libosinfo project. $OSINFO_SYSTEM_DIR itself depends on $VIRT_PREFIX, which along with a bunch of other environment variables is defined not at the job level but rather at the machine level, making it opaque to anyone except the Jenkins administrator: the plan is to move even more environment variables to the default make_env over time. Signed-off-by: Andrea Bolognani --- jobs/defaults.yaml | 1 + projects/libosinfo.yaml | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index a403d0e..7aa5a30 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -9,6 +9,7 @@ if [ "$unamestr" =3D 'FreeBSD' ]; then MAKE=3D'gmake' fi + export OSINFO_SYSTEM_DIR=3D$VIRT_PREFIX/share/osinfo check_env: | export VIR_TEST_EXPENSIVE=3D1 export VIR_TEST_DEBUG=3D2 diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 77c0414..7fa5b48 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -7,13 +7,6 @@ - libvirt-fedora-26 - libvirt-fedora-rawhide title: libosinfo - make_env: | - MAKE=3D'make' - unamestr=3D`uname` - if [ "$unamestr" =3D 'FreeBSD' ]; then - MAKE=3D'gmake' - fi - export OSINFO_SYSTEM_DIR=3D$VIRT_PREFIX/share/osinfo jobs: - autotools-build-job: parent_jobs: 'osinfo-db-master-build' --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list