From nobody Fri May 3 15:38:10 2024 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 Reviewed-by: Pavel Hrdina --- 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 From nobody Fri May 3 15:38:10 2024 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 Reviewed-by: Pavel Hrdina --- 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 From nobody Fri May 3 15:38:10 2024 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 151094319840139.795940875177735; Fri, 17 Nov 2017 10:26:38 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96F8CC0567A3; Fri, 17 Nov 2017 18:26:36 +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 3C63711A4E3; Fri, 17 Nov 2017 18:26:36 +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 02D784A467; Fri, 17 Nov 2017 18:26:36 +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 vAHIQMUB030947 for ; Fri, 17 Nov 2017 13:26:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id D7EDF83A77; Fri, 17 Nov 2017 18:26:22 +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 3F77383A9C for ; Fri, 17 Nov 2017 18:26:22 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 19:26:10 +0100 Message-Id: <20171117182612.16109-4-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 3/5] jobs: Rename {check_env} to {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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 17 Nov 2017 18:26:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There's no reason to have an environment which is tied, at least in name, to *-check-job only: having a local environment is something that can be useful for any kind of job, so it's better to use a neutral name. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- jobs/autotools.yaml | 2 +- jobs/defaults.yaml | 2 +- projects/libosinfo.yaml | 2 +- projects/libvirt.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 8a37d00..f6a2af0 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -120,7 +120,7 @@ builders: - shell: | {global_env} - {check_env} + {env} cd build if ! $MAKE -j{smp} check then diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index e2a5b1a..86e7100 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -9,6 +9,6 @@ if [ "$unamestr" =3D 'FreeBSD' ]; then MAKE=3D'gmake' fi - check_env: | + env: | smp: 3 spam: ymankad@redhat.com libvirt-ci@redhat.com diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 9ab2281..311ca71 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -11,7 +11,7 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: libosinfo - check_env: | + env: | export OSINFO_SYSTEM_DIR=3D$VIRT_PREFIX/share/osinfo jobs: - autotools-build-job: diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 5661066..52f8740 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -28,7 +28,7 @@ parent_jobs: 'libvirt-master-build' - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' - check_env: | + env: | export VIR_TEST_EXPENSIVE=3D1 export VIR_TEST_DEBUG=3D2 - autotools-rpm-job: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:38:10 2024 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 1510943188593470.5179331713621; Fri, 17 Nov 2017 10:26:28 -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 D336681DE8; Fri, 17 Nov 2017 18:26:26 +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 A7F159652D; Fri, 17 Nov 2017 18:26:26 +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 6DF704A469; Fri, 17 Nov 2017 18:26:26 +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 vAHIQN40030955 for ; Fri, 17 Nov 2017 13:26:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id E0BEC83A77; Fri, 17 Nov 2017 18:26:23 +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 3F42F83A95 for ; Fri, 17 Nov 2017 18:26:23 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 19:26:11 +0100 Message-Id: <20171117182612.16109-5-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 4/5] jobs: Include {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.25]); Fri, 17 Nov 2017 18:26:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Any job might need to define a custom environment, so it should be included everywhere to make it possible. A side-effect of this change is that $OSINFO_SYSTEM_DIR will be defined in libosinfo-master-rpm's environment, and the job should stop failing. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- jobs/autotools.yaml | 5 +++++ jobs/generic.yaml | 4 ++++ jobs/go.yaml | 2 ++ jobs/perl-makemaker.yaml | 3 +++ jobs/perl-modulebuild.yaml | 3 +++ jobs/python-distutils.yaml | 3 +++ 6 files changed, 20 insertions(+) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index f6a2af0..d71d0ce 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -41,6 +41,7 @@ builders: - shell: | {global_env} + {env} mkdir build cd build ../autogen.sh --prefix=3D$VIRT_PREFIX {autogen_args} @@ -82,6 +83,7 @@ builders: - shell: | {global_env} + {env} cd build $MAKE -j{smp} syntax-check publishers: @@ -164,6 +166,7 @@ builders: - shell: | {global_env} + {env} cd build sed -i -e 's/BuildRequires: osinfo-db.*//' {name}.spec sed -i -e 's/BuildRequires: libvirt.*devel.*//' {name}.spec @@ -219,6 +222,7 @@ builders: - shell: | {global_env} + {env} mkdir -p build32 cd build32 =20 @@ -230,6 +234,7 @@ $MAKE -j{smp} install - shell: | {global_env} + {env} mkdir -p build64 cd build64 =20 diff --git a/jobs/generic.yaml b/jobs/generic.yaml index 20ef5da..9b4569f 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -41,6 +41,7 @@ builders: - shell: | {global_env} + {env} {command} publishers: - email: @@ -78,6 +79,7 @@ builders: - shell: | {global_env} + {env} {command} publishers: - email: @@ -115,6 +117,7 @@ builders: - shell: | {global_env} + {env} {command} publishers: - email: @@ -153,6 +156,7 @@ builders: - shell: | {global_env} + {env} {command} publishers: - email: diff --git a/jobs/go.yaml b/jobs/go.yaml index 8764395..22d3459 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -41,6 +41,7 @@ builders: - shell: | {global_env} + {env} go build -v publishers: - email: @@ -78,6 +79,7 @@ builders: - shell: | {global_env} + {env} go test -tags api publishers: - email: diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 930d4ee..ea05b61 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -42,6 +42,7 @@ - shell: | perl Makefile.PL PREFIX=3D"$VIRT_PREFIX" {global_env} + {env} $MAKE $MAKE -j{smp} install $MAKE -j{smp} manifest @@ -83,6 +84,7 @@ builders: - shell: | {global_env} + {env} $MAKE -j{smp} test {test_args} publishers: - email: @@ -121,6 +123,7 @@ builders: - shell: | {global_env} + {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/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 188b153..e556237 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -41,6 +41,7 @@ builders: - shell: | {global_env} + {env} perl Build.PL install_base=3D"$VIRT_PREFIX" perl Build perl Build manifest @@ -82,6 +83,7 @@ builders: - shell: | {global_env} + {env} perl Build test publishers: - email: @@ -120,6 +122,7 @@ builders: - shell: | {global_env} + {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 b0e3f5f..fc969ad 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -41,6 +41,7 @@ builders: - shell: | {global_env} + {env} {command_pre_build} python2 setup.py build python2 setup.py install --prefix=3D$VIRT_PREFIX @@ -81,6 +82,7 @@ builders: - shell: | {global_env} + {env} python2 setup.py test publishers: - email: @@ -118,6 +120,7 @@ builders: - shell: | {global_env} + {env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in python2 setup.py rpm publishers: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 15:38:10 2024 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 151094319510457.65589659366481; Fri, 17 Nov 2017 10:26:35 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B51CEC05679B; 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 92D305C8B6; 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 4D7AD180474A; Fri, 17 Nov 2017 18:26:33 +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 vAHIQPv9030972 for ; Fri, 17 Nov 2017 13:26:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2168483A9C; Fri, 17 Nov 2017 18:26:25 +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 4B91783A77 for ; Fri, 17 Nov 2017 18:26:24 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 19:26:12 +0100 Message-Id: <20171117182612.16109-6-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 5/5] jobs: Include $PATH definition in {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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 17 Nov 2017 18:26:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" $PATH is generic enough that it shouldn't be limited to the osinfo-db project. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- jobs/defaults.yaml | 1 + projects/osinfo-db.yaml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 86e7100..7b2c040 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -9,6 +9,7 @@ if [ "$unamestr" =3D 'FreeBSD' ]; then MAKE=3D'gmake' fi + export PATH=3D$VIRT_PREFIX/bin:$PATH env: | smp: 3 spam: ymankad@redhat.com libvirt-ci@redhat.com diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 95ad845..2a9cab2 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: | - export PATH=3D$VIRT_PREFIX/bin:$PATH $MAKE -j{smp} all $MAKE install OSINFO_DB_TARGET=3D"--system" - generic-rpm-job: @@ -26,7 +25,6 @@ - libvirt-fedora-26 - libvirt-fedora-rawhide command: | - export PATH=3D$VIRT_PREFIX/bin:$PATH rm -f *.tar.xz $MAKE osinfo-db.spec perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db= .spec --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list