From 349687c73ae0527c2f7c93825d3eae87dad9a6c5 Mon Sep 17 00:00:00 2001
From: Deborah Brouwer <deborah.brouwer@collabora.com>
Date: Thu, 7 Nov 2024 19:55:57 -0800
Subject: [PATCH] ci/b2c: update RESULTS_DIR for .b2c-test jobs

Since $RESULTS_DIR is now centrally defined in setup-test-env.sh it's no
longer necessary to manually add a hard-coded results directory for the
b2b-test job results.

This keeps the results directory consistent between b2c-test jobs and lava.

Fixes: 9b6d14aed1 ("ci: Always create results dir from init")
(cherry picked from commit 276447ef814ba94db2a75f9c5a16bd542e0642bf)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32119>
---
 .gitlab-ci/test/gitlab-ci.yml | 2 +-
 .pick_status.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 4435eb44029..108cb9573ae 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -370,7 +370,7 @@ yaml-toml-shell-test:
   after_script:
     # Keep the results path the same as baremetal and LAVA
     - mkdir -p "${JOB_FOLDER}"/results
-    - mv "${JOB_FOLDER}"/results results/
+    - mv "${JOB_FOLDER}"/results ./
     - !reference [default, after_script]
 
   artifacts:
diff --git a/.pick_status.json b/.pick_status.json
index 793edbb41fc..821979cf836 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -934,7 +934,7 @@
         "description": "ci/b2c: update RESULTS_DIR for .b2c-test jobs",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9b6d14aed1df46c31b9debd9b7c346b4dcb76662",
         "notes": null