[v2] gitlab: expand the CI job coverage (RESEND)

[libvirt PATCH v2 7/9] gitlab: add variable for make command name

Posted by Daniel P. Berrangé 5 years, 10 months ago

To facilitate future jobs that will use FreeBSD

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58abcbe1f3..9814b6580a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,9 @@ stages:
   - cross_build
   - native_build_extra
 
+variables:
+  MAKE: make
+
 
 # Common templates
 
@@ -14,8 +17,8 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN) syntax-check
-    - make -j $(getconf _NPROCESSORS_ONLN) distcheck
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) syntax-check
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) distcheck
 
 # Native jobs that will only run post merge on master branch
 # Switch to running against merge requests later
@@ -36,7 +39,7 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN)
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN)
 
 
 # Native architecture build + test jobs
@@ -120,8 +123,8 @@ website:
     - mkdir build
     - cd build
     - ../autogen.sh --prefix=$(pwd)/../vroot || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN) -C docs
-    - make -j $(getconf _NPROCESSORS_ONLN) -C docs install
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs install
     - cd ..
     - mv vroot/share/doc/libvirt/html/ website
   image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest
-- 
2.24.1

Re: [libvirt PATCH v2 7/9] gitlab: add variable for make command name

Posted by Andrea Bolognani 5 years, 10 months ago

On Tue, 2020-03-24 at 16:24 +0000, Daniel P. Berrangé wrote:
> To facilitate future jobs that will use FreeBSD
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  .gitlab-ci.yml | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)

As mentioned, this should be the very first patch in the series.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

Re: [libvirt PATCH v2 7/9] gitlab: add variable for make command name

Posted by Erik Skultety 5 years, 10 months ago

On Tue, Mar 24, 2020 at 06:47:50PM +0100, Andrea Bolognani wrote:
> On Tue, 2020-03-24 at 16:24 +0000, Daniel P. Berrangé wrote:
> > To facilitate future jobs that will use FreeBSD
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  .gitlab-ci.yml | 13 ++++++++-----
> >  1 file changed, 8 insertions(+), 5 deletions(-)
>
> As mentioned, this should be the very first patch in the series.
>
> Reviewed-by: Andrea Bolognani <abologna@redhat.com>

Agreed.
Reviewed-by: Erik Skultety <eskultet@redhat.com>