From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35E706EDBA for ; Thu, 29 Jul 2021 14:49:14 +0000 (UTC) Date: Thu, 29 Jul 2021 17:51:23 +0300 From: Petri Latvala Message-ID: References: <20210729143755.349932-1-daniels@collabora.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [igt-dev] [PATCH] ci: Use FDO_CI_CONCURRENT to limit build/test concurrency List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Daniel Stone Cc: igt-dev@lists.freedesktop.org List-ID: On Thu, Jul 29, 2021 at 05:46:33PM +0300, Petri Latvala wrote: > On Thu, Jul 29, 2021 at 03:37:55PM +0100, Daniel Stone wrote: > > ${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 > > --- > > .gitlab-ci.yml | 38 +++++++++++++++++++------------------- > > 1 file changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index 3b0e98ae..b5edfee8 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 -C build test --num-processes ${FDO_CI_CONCURRENT:-4} > > usage: meson [-h] {setup,configure,dist,install,introspect,init,test,wrap,subprojects,help,rewrite,compile} ... > meson: error: unrecognized arguments: -C --num-processes 4 > > > Doesn't ninja -C build -j $... test work for this? Based on my tests, no. -- Petri Latvala _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev