From 2cdeef1c408a28b1bafd4441f962e2b3463f0f96 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 12 Aug 2023 18:24:44 +0200 Subject: [PATCH] ci/deqp: really remove the uncompressed results.csv file Arguments are parsed in order, so the `-c` here causes that first `--rm` won't get applied and then it gets overriden by `-o` which writes the file. Sadly zstd won't report this as a issue, but that's being reported in [1], so maybe in future versions zstd will warn about it. [1] https://github.com/facebook/zstd/issues/3719 Fixes: d110299d77c9 ("ci/deqp-runner: compress results.csv before uploading it to GitLab") Signed-off-by: David Heidelberg Part-of: (cherry picked from commit 9bf104f9348d5e7a04268399a5d68523e886d487) --- .gitlab-ci/deqp-runner.sh | 2 +- .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 19d0bc51d21..470ba1fb0f8 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -229,7 +229,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 -8qc $RESULTS/results.csv -o $RESULTS/results.csv.zst +zstd --rm -T0 -8q "$RESULTS/results.csv" -o "$RESULTS/results.csv.zst" section_end test_post_process diff --git a/.pick_status.json b/.pick_status.json index b7fbb7656d1..81f97c11601 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1642,7 +1642,7 @@ "description": "ci/deqp: really remove the uncompressed results.csv file", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d110299d77c9663bf3d91a50d447f8db4f64acb0" },