[libvirt] [jenkins-ci PATCH 1/5] jobs: Rename {make_env} to {global_env}
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 <abologna(a)redhat.com>
---
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=$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='make'
unamestr=`uname`
if [ "$unamestr" = '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="$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=$VIRT_PREFIX/bin:$PATH
$MAKE -j{smp} all
$MAKE install OSINFO_DB_TARGET="--system"
@@ -27,7 +27,7 @@
- libvirt-fedora-26
- libvirt-fedora-rawhide
command: |
- {make_env}
+ {global_env}
export PATH=$VIRT_PREFIX/bin:$PATH
rm -f *.tar.xz
$MAKE osinfo-db.spec
--
2.14.3