From f006231e0d83aa8996043ae1b42f887f473b7978 Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Thu, 17 Mar 2022 12:09:56 +0100
Subject: [PATCH] ci: Name results dir in artifact according to job name

In addition don't base the artifact filename on the CI_JOB_NAME,
because of the "parallel" specifier the name contains a '/' which
breaks the naming.

Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/735>
---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26f48dd..7ae0204 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,13 +156,17 @@ make check venus:
   stage: test
   extends:
     - .set-image-base-tag
+  before_script:
+    - export CI_JOB_NAME_SANITIZED="$(echo $CI_JOB_NAME | tr ' /' '--')"
   variables:
     MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH}
     MESA_IMAGE_TAG: ${DEBIAN_X86_TEST_GL_TAG}
   script:
+    - export DEQP_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}"
+    - export PIGLIT_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}"
     - .gitlab-ci/container/debian/x86_test.sh
   artifacts:
-    name: "virgl_${CI_JOB_NAME}"
+    name: "virgl-result"
     when: always
     paths:
       - results/