From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 21 Jun 2021 14:45:09 +0000 (+0200)
Subject: ci: attempt to make CI more robust by reducing paralelism
X-Git-Tag: v5.4.0~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34c6e29fe2842201225cd4b97fef2cbd3e776bae;p=thirdparty%2Fknot-resolver.git

ci: attempt to make CI more robust by reducing paralelism

Some tests (typically those using network) ocassionally fail due to
timeouts, which is probably due to increased CI load - perhaps reducing
it could make the tests more stable.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index decff4550..f04f66b44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ build:armhf:
     - meson build_ci_armhf --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled
     - ninja -C build_ci_armhf
     - ninja -C build_ci_armhf install >/dev/null
-    - ${MESON_TEST} --suite unit --suite config --no-suite snowflake --no-suite y2k38
+    - MESON_TESTTHREADS=1 ${MESON_TEST} --suite unit --suite config --no-suite snowflake --no-suite y2k38
 
 build:arm64:
   <<: *build
@@ -112,7 +112,7 @@ build:arm64:
     - meson build_ci_arm64 --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled
     - ninja -C build_ci_arm64
     - ninja -C build_ci_arm64 install >/dev/null
-    - ${MESON_TEST} --suite unit --suite config --no-suite snowflake
+    - MESON_TESTTHREADS=1 ${MESON_TEST} --suite unit --suite config --no-suite snowflake
 
 build-asan:
   <<: *build
@@ -123,7 +123,7 @@ build-asan:
     - ninja -C build_ci_asan install >/dev/null
       # TODO _leaks: not sure what exactly is wrong in leak detection on config tests
       # TODO skip_asan: all three of these disappear locally when using gcc 9.1 (except some leaks)
-    - ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite skip_asan --no-suite snowflake
+    - MESON_TESTTHREADS=1 ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite skip_asan --no-suite snowflake
 
 build:macOS:
   <<: *nodep