Thomas Huth <th...@redhat.com> writes:
> Some people might want to run the gitlab CI pipelines in an environment
> where multiple CPUs are available to the runners, so let's rather get
> the number for "-j" from the "nproc" program (increased by 1 to compensate
> for jobs that wait for I/O) instead of hard-coding it.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
<snip>
> @@ -25,8 +27,8 @@ build-system1:
> - ../configure --enable-werror --target-list="aarch64-softmmu alpha-softmmu
> cris-softmmu hppa-softmmu lm32-softmmu moxie-softmmu
> microblazeel-softmmu
> mips64el-softmmu m68k-softmmu ppc-softmmu riscv64-softmmu
> sparc-softmmu"
> - - make -j2
> - - make -j2 check
> + - make -j"$JOBS"
> + - make -j"$JOBS" check
>
> build-system2:
> image: fedora:latest
> @@ -40,8 +42,8 @@ build-system2:
> - ../configure --enable-werror --target-list="tricore-softmmu
> unicore32-softmmu
> microblaze-softmmu mips-softmmu riscv32-softmmu s390x-softmmu
> sh4-softmmu
> sparc64-softmmu x86_64-softmmu xtensa-softmmu nios2-softmmu
> or1k-softmmu"
> - - make -j2
> - - make -j2 check
> + - make -j"$JOBS"
> + - make -j"$JOBS" check
>
> build-disabled:
> image: fedora:latest
> @@ -56,8 +58,8 @@ build-disabled:
> --disable-qom-cast-debug --disable-spice --disable-vhost-vsock
> --disable-vhost-net --disable-vhost-crypto --disable-vhost-user
> --target-list="i386-softmmu ppc64-softmmu mips64-softmmu
> i386-linux-user"
> - - make -j2
> - - make -j2 check-qtest SPEED=slow
> + - make -j"$JOBS"
> + - make -j"$JOBS" check-qtest SPEED=slow
I would make all the check jobs use a single core as it otherwise gets
hard to figure out exactly where something broke/hung.
<snip>
> @@ -100,8 +102,8 @@ build-clang:
> - ../configure --cc=clang --cxx=clang++ --enable-werror
> --target-list="alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu
> ppc-softmmu s390x-softmmu x86_64-softmmu arm-linux-user"
> - - make -j2
> - - make -j2 check
> + - make -j"$JOBS"
> + - make -j"$JOBS" check
Ditto for this check
>
> build-tci:
> image: centos:8
> @@ -112,7 +114,7 @@ build-tci:
> - cd build
> - ../configure --enable-tcg-interpreter
> --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu ';
> done)"
> - - make -j2
> + - make -j"$JOBS"
> - make run-tcg-tests-x86_64-softmmu
> - make tests/qtest/boot-serial-test tests/qtest/cdrom-test
> tests/qtest/pxe-test
> - for tg in $TARGETS ; do
Otherwise:
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
--
Alex Bennée
