Mesa (staging/21.3): ci/deqp-runner: Drop silly CSV env vars.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: cefaf03c2f8096f72909eabf247727066370712d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cefaf03c2f8096f72909eabf247727066370712d

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Oct 12 10:37:43 2021 -0700

ci/deqp-runner: Drop silly CSV env vars.

One was unused, the other was used once.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372>
(cherry picked from commit 37c690ad1ae01dce10b0989d71ef0fb3bd913642)

---

 .gitlab-ci/deqp-runner.sh          | 6 +-----
 .gitlab-ci/piglit/piglit-runner.sh | 5 +----
 .pick_status.json                  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 304b1abe724..18cddc03489 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -145,10 +145,6 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
     sleep 1
 fi
 
-
-RESULTS_CSV=$RESULTS/results.csv
-FAILURES_CSV=$RESULTS/failures.csv
-
 export LD_PRELOAD=$TEST_LD_PRELOAD
 
 if [ -z "$DEQP_SUITE" ]; then
@@ -214,7 +210,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
   python3 $INSTALL/report-flakes.py \
          --host irc.oftc.net \
          --port 6667 \
-         --results $RESULTS_CSV \
+         --results $RESULTS/results.csv \
          --known-flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
          --channel "$FLAKES_CHANNEL" \
          --runner "$CI_RUNNER_DESCRIPTION" \
diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh
index 5c4b88ed0f0..3d12363e831 100755
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -53,9 +53,6 @@ fi
 
 set +e
 
-RESULTS_CSV=$RESULTS/results.csv
-FAILURES_CSV=$RESULTS/failures.csv
-
 export LD_PRELOAD=$TEST_LD_PRELOAD
 
     piglit-runner \
@@ -86,7 +83,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
   python3 $INSTALL/report-flakes.py \
          --host irc.oftc.net \
          --port 6667 \
-         --results $RESULTS_CSV \
+         --results $RESULTS/results.csv \
          --known-flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \
          --channel "$FLAKES_CHANNEL" \
          --runner "$CI_RUNNER_DESCRIPTION" \
diff --git a/.pick_status.json b/.pick_status.json
index a2a2091173d..d70ac40bcf6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4090,7 +4090,7 @@
         "description": "ci/deqp-runner: Drop silly CSV env vars.",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },