[libvirt] [jenkins-ci PATCH 0/2] Small fixes
Andrea Bolognani (2): jobs: Use $MAKE in autotools-mingw-job projects: Use {smp} in osinfo-db-master-build jobs/autotools.yaml | 8 ++++---- projects/osinfo-db.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.14.3
We were hard-coding 'make' instead of using the $MAKE environment variable, which has been defined specifically for use in this context. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/autotools.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 19f62be..74378ce 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -225,8 +225,8 @@ export PKG_CONFIG_PATH="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ export PREFIX=$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw ../autogen.sh --host=i686-w64-mingw32 --prefix=$PREFIX - make -j{smp} - make -j{smp} install + $MAKE -j{smp} + $MAKE -j{smp} install - shell: | mkdir -p build64 cd build64 @@ -235,8 +235,8 @@ export PKG_CONFIG_PATH="$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ export PREFIX=$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw ../autogen.sh --host=x86_64-w64-mingw32 --prefix=$PREFIX - make -j{smp} - make -j{smp} install + $MAKE -j{smp} + $MAKE -j{smp} install publishers: - email: recipients: '{obj:spam}' -- 2.14.3
On Thu, Nov 16, 2017 at 06:28:49PM +0100, Andrea Bolognani wrote:
We were hard-coding 'make' instead of using the $MAKE environment variable, which has been defined specifically for use in this context.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/autotools.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
We were hard-coding '3' instead of using the {smp} yaml variable, which has been defined specifically for use in this context. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 9a7d5e1..6fa1895 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -17,7 +17,7 @@ command: | {make_env} export PATH=$VIRT_PREFIX/bin:$PATH - $MAKE -j3 all + $MAKE -j{smp} all $MAKE install OSINFO_DB_TARGET="--system" - generic-rpm-job: parent_jobs: 'osinfo-db-master-build' -- 2.14.3
On Thu, Nov 16, 2017 at 06:28:50PM +0100, Andrea Bolognani wrote:
We were hard-coding '3' instead of using the {smp} yaml variable, which has been defined specifically for use in this context.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrange