[libvirt] [jenkins-ci PATCH 1/7] projects: make sure that we use correct make for all projects
On FreeBSD we need to use gmake.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
projects/libvirt-cim.yaml | 8 +++++---
projects/osinfo-db.yaml | 10 ++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml
index e1c8fb1..b5405f3 100644
--- a/projects/libvirt-cim.yaml
+++ b/projects/libvirt-cim.yaml
@@ -12,12 +12,14 @@
- generic-build-job:
parent_jobs: 'libvirt-master-build'
command: |
+ {make_env}
./autogen.sh
./configure --prefix=$VIRT_PREFIX
- make -j{smp}
- make -j{smp} install
+ $MAKE -j{smp}
+ $MAKE -j{smp} install
- generic-rpm-job:
parent_jobs: 'libvirt-cim-master-build'
command: |
+ {make_env}
sed -i -e "s/.*libvirt-devel.*//" libvirt-cim.spec.in
- make -j{smp} rpm
+ $MAKE -j{smp} rpm
diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml
index 9fec36a..169c76b 100644
--- a/projects/osinfo-db.yaml
+++ b/projects/osinfo-db.yaml
@@ -14,14 +14,16 @@
- generic-build-job:
parent_jobs: 'osinfo-db-tools-master-build'
command: |
+ {make_env}
export PATH=$VIRT_PREFIX/bin:$PATH
- make -j3 all
- make install OSINFO_DB_TARGET="--system"
+ $MAKE -j3 all
+ $MAKE install OSINFO_DB_TARGET="--system"
- generic-rpm-job:
parent_jobs: 'osinfo-db-master-build'
command: |
+ {make_env}
export PATH=$VIRT_PREFIX/bin:$PATH
rm -f *.tar.xz
- make osinfo-db.spec
+ $MAKE osinfo-db.spec
perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec
- make rpm
+ $MAKE rpm
--
2.13.6