From: Michał Kępień <michal@isc.org>
Date: Fri, 9 Mar 2018 13:09:28 +0000 (+0100)
Subject: Enable runner-specific make concurrency settings
X-Git-Tag: v9.13.0~103^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c330c65e7728351e1077ed8679f248b12ff1a54b;p=thirdparty%2Fbind9.git

Enable runner-specific make concurrency settings

Using fixed make concurrency settings on all runners is not flexible and
requires .gitlab-ci.yml to be modified each time tweaking these settings
is needed.  Use environment variables which are expected to be set by
the runner (defaulting to 1 in case they are not set) for controlling
make concurrency.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e05008b0413..34c39b5b110 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ stages:
     - ./autogen.sh
   script:
     - ./configure --enable-developer --with-libtool --disable-static --with-atf=/usr/local
-    - make -j${BUILD_PARALLEL_JOBS:-2} -k all V=1
+    - make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1
   artifacts:
     expire_in: '1 hour'
     untracked: true
@@ -99,7 +99,7 @@ stages:
   before_script:
     - bash -x bin/tests/system/ifconfig.sh up
   script:
-    - cd bin/tests && make -j${TEST_PARALLEL_JOBS:-4} -k test V=1
+    - cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1
   artifacts:
     untracked: true
     expire_in: '1 week'