From e9998fdef55f256943534aa054daab24a9d56990 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 29 Jul 2024 18:28:05 +0200 Subject: [PATCH] ci/{deqp,piglit}-runner: make zstd respect FDO_CI_CONCURRENT when set, and fallback to the current "all the threads" Also, expand `-q` to `--quiet` to be more explicit, and drop a stray `-c` which did nothing except cancel out `--rm`. Part-of: --- .gitlab-ci/deqp-runner.sh | 2 +- .gitlab-ci/piglit/piglit-runner.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index f41e3d58d39..b39bb3548a2 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -275,7 +275,7 @@ fi # Compress results.csv to save on bandwidth during the upload of artifacts to # GitLab. This reduces the size in a VKCTS run from 135 to 7.6MB, and takes # 0.17s on a Ryzen 5950X (16 threads, 0.95s when limited to 1 thread). -zstd --rm -T0 -8q "$RESULTS_DIR/results.csv" -o "$RESULTS_DIR/results.csv.zst" +zstd --quiet --rm --threads ${FDO_CI_CONCURRENT:-0} -8 "$RESULTS_DIR/results.csv" -o "$RESULTS_DIR/results.csv.zst" set +x section_end test_post_process diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index b786e4b9082..df8e508b95e 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -131,6 +131,6 @@ fi # Compress results.csv to save on bandwidth during the upload of artifacts to # GitLab. This reduces a full piglit run to 550 KB, down from 6 MB, and takes # 55ms on my Ryzen 5950X (with or without parallelism). -zstd --rm -T0 -8qc $RESULTS_DIR/results.csv -o $RESULTS_DIR/results.csv.zst +zstd --quiet --rm --threads ${FDO_CI_CONCURRENT:-0} -8 $RESULTS_DIR/results.csv -o $RESULTS_DIR/results.csv.zst exit $PIGLIT_EXITCODE