diff options
author | Daniel Stone <daniels@collabora.com> | 2021-07-29 15:49:46 +0100 |
---|---|---|
committer | Petri Latvala <petri.latvala@intel.com> | 2021-07-29 18:41:36 +0300 |
commit | 88c457f16a7205f06bef86d48cd24520b91f57c4 (patch) | |
tree | d7727aab71cbf700531705957dea4abd1cf00a1b /.gitlab-ci.yml | |
parent | 354638455597ac48ac433606b24b82a4d7b65d20 (diff) |
ci: Use FDO_CI_CONCURRENT to limit build/test concurrency
${FDO_CI_CONCURRENT} is set to an appropriate concurrency on our shared
runners. Using all available CPUs will just DoS the world and would
explain a lot about the timeouts.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b0e98ae..0de61828 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,9 +64,9 @@ build:tests-fedora: stage: build script: - meson --prefix=/opt/igt $MESON_OPTIONS build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 - DESTDIR="$PWD/installdir" ninja -C build install - - ninja -C build igt-gpu-tools-doc + - ninja -C build -j${FDO_CI_CONCURRENT:-4} igt-gpu-tools-doc artifacts: paths: - build @@ -77,7 +77,7 @@ build:tests-fedora-no-libunwind: script: - dnf remove -y libunwind-devel - meson -Dlibunwind=disabled build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 # documentation building is different with meson<0.47 build:tests-fedora-oldest-meson: @@ -86,15 +86,15 @@ build:tests-fedora-oldest-meson: - dnf remove -y meson - pip install /usr/src/meson-*.tar.gz - meson $MESON_OPTIONS build - - ninja -C build || ninja -C build -j 1 - - ninja -C build igt-gpu-tools-doc + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} igt-gpu-tools-doc # ensure igt_nouveau stubs build when nouveau support for libdrm is disabled build:tests-fedora-no-libdrm-nouveau: stage: build script: - meson -Dlibdrm_drivers= build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 build:tests-fedora-clang: stage: build @@ -102,7 +102,7 @@ build:tests-fedora-clang: CC: clang script: - meson $MESON_OPTIONS build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 artifacts: paths: - build @@ -112,7 +112,7 @@ build:tests-debian-meson: stage: build script: - meson $MESON_OPTIONS build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 - cp build/tests/test-list.txt meson-test-list.txt artifacts: paths: @@ -123,7 +123,7 @@ build:tests-debian-minimal: stage: build script: - meson -Dtests=disabled -Dlibdrm_drivers="" build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 artifacts: paths: - build @@ -134,7 +134,7 @@ build:tests-debian-meson-armhf: script: - export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ - meson --cross-file meson-cross-armhf.txt build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 artifacts: paths: - build @@ -145,7 +145,7 @@ build:tests-debian-meson-arm64: script: - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/ - meson --cross-file meson-cross-arm64.txt build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 artifacts: paths: - build @@ -156,7 +156,7 @@ build:tests-debian-meson-mips: script: - export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/ - meson --cross-file meson-cross-mips.txt build - - ninja -C build || ninja -C build -j 1 + - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1 artifacts: paths: - build @@ -168,7 +168,7 @@ test:ninja-test: dependencies: - build:tests-fedora stage: test - script: ninja -C build test + script: meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} test:ninja-test-clang: retry: 2 @@ -177,7 +177,7 @@ test:ninja-test-clang: variables: CC: clang stage: test - script: ninja -C build test + script: meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} test:ninja-test-minimal: retry: 2 @@ -185,7 +185,7 @@ test:ninja-test-minimal: dependencies: - build:tests-debian-minimal stage: test - script: ninja -C build test + script: meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} test:ninja-test-arm64: retry: 2 @@ -196,7 +196,7 @@ test:ninja-test-arm64: script: - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/ - env > build/envdump.txt - - ninja -C build test + - meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} artifacts: paths: - build @@ -211,7 +211,7 @@ test:ninja-test-armhf: script: - export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/ - env > build/envdump.txt - - ninja -C build test + - meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} artifacts: paths: - build @@ -226,7 +226,7 @@ test:ninja-test-mips: script: - export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/ - env > build/envdump.txt - - ninja -C build test + - meson test -C build --num-processes ${FDO_CI_CONCURRENT:-4} artifacts: paths: - build @@ -255,7 +255,7 @@ pages: - build:tests-fedora stage: deploy script: - - ninja -C build igt-gpu-tools-doc + - ninja -C build -j${FDO_CI_CONCURRENT:-4} igt-gpu-tools-doc - cp -r build/docs/reference/igt-gpu-tools/html public artifacts: paths: |