diff options
| author | Eric Anholt <eric@anholt.net> | 2020-06-26 10:59:41 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-20 17:22:17 +0000 |
| commit | fd24a959956759dfed987ef83813515b10ffb202 (patch) | |
| tree | 7a87ef98355902490e7753afdd74d0ccf9ac39a5 /.gitlab-ci | |
| parent | 5f79e4e69af178f7fcff5a4397085261ac46ceaf (diff) | |
ci: Use FDO_CI_CONCURRENT as our -j flags when present in the runner env.
fd.o has retuned the x86 runners on packet for -j8. Rather than having to
tweak our CI every time fd.o decides to rebalance job concurrency, respect
what the runner admin has chosen for their builds (this will also be
convenient for people with large local runners).
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5669>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/container_pre_build.sh | 11 | ||||
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/piglit/run.sh | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh index 97afb0083a4..c793e2f6b2c 100755 --- a/.gitlab-ci/container/container_pre_build.sh +++ b/.gitlab-ci/container/container_pre_build.sh @@ -14,16 +14,11 @@ export CXX="/usr/lib/ccache/g++" ccache --show-stats -if uname -m | grep -q arm || uname -m | grep -q aarch64; then - export JFLAGS=-j8 -else - export JFLAGS=-j4 -fi - # Make a wrapper script for ninja to always include the -j flags -echo /usr/bin/ninja $JFLAGS '"$@"' > /usr/local/bin/ninja +echo '#!/bin/sh -x' > /usr/local/bin/ninja +echo '/usr/bin/ninja -j${FDO_CI_CONCURRENT:-4} "$@"' >> /usr/local/bin/ninja chmod +x /usr/local/bin/ninja # Set MAKEFLAGS so that all make invocations in container builds include the # flags (doesn't apply to non-container builds, but we don't run make there) -export MAKEFLAGS=$JFLAGS +export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}" diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index fb3e87bd55c..f68dd00600c 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -80,6 +80,10 @@ set +e if [ -n "$DEQP_PARALLEL" ]; then JOB="--job $DEQP_PARALLEL" +elif [ -n "$FDO_CI_CONCURRENT" ]; then + JOB="--job $FDO_CI_CONCURRENT" +else + JOB="--job 4" fi run_cts() { diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index e834cb4e978..c1f50b9751f 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -11,7 +11,7 @@ PIGLIT_OPTIONS=$(echo $PIGLIT_OPTIONS | head -n 1) xvfb-run --server-args="-noreset" sh -c \ "export LD_LIBRARY_PATH=$OLDPWD/install/lib; wflinfo --platform glx --api gl --profile core | grep \"Mesa $VERSION\\\$\" && - ./piglit run -j4 $PIGLIT_OPTIONS $PIGLIT_PROFILES $OLDPWD/results" + ./piglit run -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_PROFILES $OLDPWD/results" PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES} mkdir -p .gitlab-ci/piglit |