From c580d604fb3632fd8eb7882fd83fcdbe7151f5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?=
 <martin.roukala@mupuf.org>
Date: Thu, 26 Oct 2023 09:28:12 +0300
Subject: [PATCH] ci/b2c: fix artifact collection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems like gitlab puts symlinks in artifacts rather than following
them. Let's fix this by copying the results folder from the job_folder
in an after script.

Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25902>
---
 .gitlab-ci/test/gitlab-ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 7abdf8b6ebf..999df40ba8d 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -375,9 +375,6 @@ clang-format:
       rm -rf ${JOB_FOLDER} || true
       mkdir -v ${JOB_FOLDER}
 
-      # Keep the results path the same as baremetal and LAVA
-      ln -s "$JOB_FOLDER"/results/ .
-
       # Create a script to regenerate the CI environment when this job
       # begins running on the remote DUT.
       set +x
@@ -405,6 +402,13 @@ clang-format:
       # Gitlab coordinator for status presentation. results/junit.xml
       # will be parsed by the UI for more detailed explanations of
       # test execution.
+
+  after_script:
+      # Keep the results path the same as baremetal and LAVA
+      - mkdir -p "${JOB_FOLDER}"/results
+      - mv "${JOB_FOLDER}"/results results/
+      - !reference [default, after_script]
+
   artifacts:
     when: always
     name: "mesa_${CI_JOB_NAME}"