From nobody Thu May 15 08:56:24 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 1510943186113726.0567227520404; Fri, 17 Nov 2017 10:26:26 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id C4C0163E16; Fri, 17 Nov 2017 18:26:24 +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 7C66695A6D; Fri, 17 Nov 2017 18:26:24 +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 B840C1800BDC; Fri, 17 Nov 2017 18:26:23 +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 vAHIQLTZ030942 for ; Fri, 17 Nov 2017 13:26:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id D4EEC83A80; Fri, 17 Nov 2017 18:26:21 +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 216CE83A77 for ; Fri, 17 Nov 2017 18:26:20 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 19:26:09 +0100 Message-Id: <20171117182612.16109-3-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 2/5] jobs: Include {global_env} everywhere 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 17 Nov 2017 18:26:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This environment will later include variables that are relevant to more than make, so it should be included every time a shell command is going to be executed. Including {global_env} in the generic-*-job templates allows us to drop the ad-hoc inclusions from the osinfo-db project. Signed-off-by: Andrea Bolognani --- jobs/autotools.yaml | 2 ++ jobs/generic.yaml | 16 ++++++++++++---- jobs/go.yaml | 2 ++ jobs/perl-modulebuild.yaml | 3 +++ jobs/python-distutils.yaml | 3 +++ projects/osinfo-db.yaml | 2 -- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index a4a5a5b..8a37d00 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -218,6 +218,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} mkdir -p build32 cd build32 =20 @@ -228,6 +229,7 @@ $MAKE -j{smp} $MAKE -j{smp} install - shell: | + {global_env} mkdir -p build64 cd build64 =20 diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 050e35d..20ef5da 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -39,7 +39,9 @@ type: slave values: '{obj:machines}' builders: - - shell: '{command}' + - shell: | + {global_env} + {command} publishers: - email: recipients: '{obj:spam}' @@ -74,7 +76,9 @@ type: slave values: '{obj:machines}' builders: - - shell: '{command}' + - shell: | + {global_env} + {command} publishers: - email: recipients: '{obj:spam}' @@ -109,7 +113,9 @@ type: slave values: '{obj:machines}' builders: - - shell: '{command}' + - shell: | + {global_env} + {command} publishers: - email: recipients: '{obj:spam}' @@ -145,7 +151,9 @@ type: slave values: '{obj:machines}' builders: - - shell: '{command}' + - shell: | + {global_env} + {command} publishers: - email: recipients: '{obj:spam}' diff --git a/jobs/go.yaml b/jobs/go.yaml index 8eee6af..8764395 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -40,6 +40,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} go build -v publishers: - email: @@ -76,6 +77,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} go test -tags api publishers: - email: diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index cb81de1..188b153 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -40,6 +40,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} perl Build.PL install_base=3D"$VIRT_PREFIX" perl Build perl Build manifest @@ -80,6 +81,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} perl Build test publishers: - email: @@ -117,6 +119,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 7055d26..b0e3f5f 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -40,6 +40,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} {command_pre_build} python2 setup.py build python2 setup.py install --prefix=3D$VIRT_PREFIX @@ -79,6 +80,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} python2 setup.py test publishers: - email: @@ -115,6 +117,7 @@ values: '{obj:machines}' builders: - shell: | + {global_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in python2 setup.py rpm publishers: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 9d70000..95ad845 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -15,7 +15,6 @@ - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' command: | - {global_env} export PATH=3D$VIRT_PREFIX/bin:$PATH $MAKE -j{smp} all $MAKE install OSINFO_DB_TARGET=3D"--system" @@ -27,7 +26,6 @@ - libvirt-fedora-26 - libvirt-fedora-rawhide command: | - {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