From 0103f02acb10dcdea23461ba214307a6827a7772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Fri, 6 Mar 2020 12:35:17 +0100
Subject: [PATCH] gitlab-ci: Always name artifacts archive after the job
 producing it

This will help determine which artifacts generate how much traffic.

v2:
* Add "mesa_" prefix to make it obvious which project the artifacts are
  from.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4085>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4085>
---
 .gitlab-ci.yml                | 6 ++++--
 .gitlab-ci/lava-gitlab-ci.yml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f91830fe3ba..56b9a7606c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,7 @@ success:
 
 .ci-deqp-artifacts:
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     untracked: false
     paths:
@@ -189,6 +190,7 @@ arm_test:
 .build-common:
   extends: .ci-run-policy
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - _build/meson-logs/*.txt
@@ -538,7 +540,7 @@ scons-old-llvm:
     - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
   artifacts:
     when: always
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    name: "mesa_${CI_JOB_NAME}"
     paths:
       - results/
   dependencies:
@@ -569,7 +571,7 @@ scons-old-llvm:
   stage: llvmpipe
   artifacts:
     when: on_failure
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    name: "mesa_${CI_JOB_NAME}"
     paths:
       - summary/
   variables:
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 9b254e4579b..00e960f86e6 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -33,6 +33,7 @@
     - echo $result
     - '[[ "$result" == "pass" ]]'
   artifacts:
+    name: "mesa_${CI_JOB_NAME}"
     when: always
     paths:
       - artifacts/