[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [jenkins-ci PATCH 2/2] jobs: use job_env in all job templates



This fixes libosinfo RPM build, we need to set "OSINFO_SYSTEM_DIR" for
RPM build as well since the spec file runs tests and they need valid
osinfo-db.  Broken by <359b069f7e4700bee337588eab0a9d83cac94010>.

Signed-off-by: Pavel Hrdina <phrdina redhat com>
---
 jobs/autotools.yaml      | 3 +++
 jobs/perl-makemaker.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml
index 9ed5efe..e41d5ab 100644
--- a/jobs/autotools.yaml
+++ b/jobs/autotools.yaml
@@ -41,6 +41,7 @@
     builders:
       - shell: |
           {make_env}
+          {job_env}
           mkdir build
           cd build
           ../autogen.sh --prefix=$VIRT_PREFIX {autogen_args}
@@ -82,6 +83,7 @@
     builders:
       - shell: |
           {make_env}
+          {job_env}
           cd build
           $MAKE -j{smp} syntax-check
     publishers:
@@ -164,6 +166,7 @@
     builders:
       - shell: |
           {make_env}
+          {job_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/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
index 0a3227a..3e53a29 100644
--- a/jobs/perl-makemaker.yaml
+++ b/jobs/perl-makemaker.yaml
@@ -42,6 +42,7 @@
       - shell: |
           perl Makefile.PL PREFIX="$VIRT_PREFIX"
           {make_env}
+          {job_env}
           $MAKE
           $MAKE -j{smp} install
           $MAKE -j{smp} manifest
@@ -83,6 +84,7 @@
     builders:
       - shell: |
           {make_env}
+          {job_env}
           $MAKE -j{smp} test {test_args}
     publishers:
       - email:
@@ -121,6 +123,7 @@
     builders:
       - shell: |
           {make_env}
+          {job_env}
           sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec
           sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
           rm -f *.tar.{archive_format}
-- 
2.13.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]