From nobody Thu May 15 08:54:32 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 1510943194960775.0819996809701; Fri, 17 Nov 2017 10:26:34 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7094340111; Fri, 17 Nov 2017 18:26:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4570111E7F5; Fri, 17 Nov 2017 18:26:33 +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 ED5041800FC5; Fri, 17 Nov 2017 18:26:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAHIQKnB030932 for ; Fri, 17 Nov 2017 13:26:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id B40BB83A77; Fri, 17 Nov 2017 18:26:20 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-27.brq.redhat.com [10.40.204.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2263F83A9F for ; Fri, 17 Nov 2017 18:26:19 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 19:26:08 +0100 Message-Id: <20171117182612.16109-2-abologna@redhat.com> In-Reply-To: <20171117182612.16109-1-abologna@redhat.com> References: <20171117182612.16109-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/5] jobs: Rename {make_env} to {global_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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 17 Nov 2017 18:26:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Right now, this environment only contains definitions that are useful when running make, but eventually it will be expanded and include all sort of variables that are not specific to a single project, eg. $VIRT_PREFIX and the like. Signed-off-by: Andrea Bolognani --- jobs/autotools.yaml | 8 ++++---- jobs/defaults.yaml | 2 +- jobs/perl-makemaker.yaml | 6 +++--- projects/osinfo-db.yaml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 74378ce..a4a5a5b 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -40,7 +40,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} mkdir build cd build ../autogen.sh --prefix=3D$VIRT_PREFIX {autogen_args} @@ -81,7 +81,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} cd build $MAKE -j{smp} syntax-check publishers: @@ -119,7 +119,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} {check_env} cd build if ! $MAKE -j{smp} check @@ -163,7 +163,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} cd build sed -i -e 's/BuildRequires: osinfo-db.*//' {name}.spec sed -i -e 's/BuildRequires: libvirt.*devel.*//' {name}.spec diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 0e628bb..e2a5b1a 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -3,7 +3,7 @@ name: global branch: master node: libvirt - make_env: | + global_env: | MAKE=3D'make' unamestr=3D`uname` if [ "$unamestr" =3D 'FreeBSD' ]; then diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 0a3227a..930d4ee 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -41,7 +41,7 @@ builders: - shell: | perl Makefile.PL PREFIX=3D"$VIRT_PREFIX" - {make_env} + {global_env} $MAKE $MAKE -j{smp} install $MAKE -j{smp} manifest @@ -82,7 +82,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} $MAKE -j{smp} test {test_args} publishers: - email: @@ -120,7 +120,7 @@ values: '{obj:machines}' builders: - shell: | - {make_env} + {global_env} sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec rm -f *.tar.{archive_format} diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 6fa1895..9d70000 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -15,7 +15,7 @@ - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' command: | - {make_env} + {global_env} export PATH=3D$VIRT_PREFIX/bin:$PATH $MAKE -j{smp} all $MAKE install OSINFO_DB_TARGET=3D"--system" @@ -27,7 +27,7 @@ - libvirt-fedora-26 - libvirt-fedora-rawhide command: | - {make_env} + {global_env} export PATH=3D$VIRT_PREFIX/bin:$PATH rm -f *.tar.xz $MAKE osinfo-db.spec --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list