[libvirt PATCH 2/2] gitlab: Define $MAKEFLAGS in environment

[Andrea Bolognani <abologna@xxxxxxxxxx>]

This way we don't need to call getconf over and over, and the actual
build steps don't end up drowned in the noise.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 .gitlab-ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eeeff7ed48..a5c5dfc52f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ stages:
 
 .environment: &environment |
   export MAKE="make"
+  export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
 
 # Common templates
 
@@ -28,7 +29,7 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE -j $(getconf _NPROCESSORS_ONLN) distcheck
+    - $MAKE distcheck
 
 # Extra native build jobs that are only run post-merge, or
 # when code is pushed to a branch with "ci-full-" name prefix
@@ -56,7 +57,7 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - $MAKE -j $(getconf _NPROCESSORS_ONLN)
+    - $MAKE
 
 # Extra cross build jobs that are only run post-merge, or
 # when code is pushed to a branch with "ci-full-" name prefix
@@ -172,8 +173,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 -C docs
+    - $MAKE -C docs install
     - cd ..
     - mv vroot/share/doc/libvirt/html/ website
   image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest
@@ -194,7 +195,7 @@ codestyle:
     - mkdir build
     - cd build
     - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE -j $(getconf _NPROCESSORS_ONLN) syntax-check
+    - $MAKE syntax-check
   image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest
 
 
@@ -211,8 +212,8 @@ potfile:
     - mkdir build
     - cd build
     - ../autogen.sh || (cat config.log && exit 1)
-    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C src generated-sources
-    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C po libvirt.pot
+    - $MAKE -C src generated-sources
+    - $MAKE -C po libvirt.pot
     - cd ..
     - mv build/po/libvirt.pot libvirt.pot
   image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest
-- 
2.25.1