Mesa (master): ci: Fix the overwriting of traces.yml for baremetal

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 292882f6bc41761e17427dcf60fa177e8964ad8d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=292882f6bc41761e17427dcf60fa177e8964ad8d

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Tue Jul 21 15:46:06 2020 +0200

ci: Fix the overwriting of traces.yml for baremetal

When the lava files were moved out of the container, this stopped
working which caused the traces job for Freedreno to not run any traces
at all.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Fixes: dcd171f5e9bd ("gitlab-ci: More stable URL for kernel and ramdisk artifacts, for LAVA")
Acked-by: Andres Gomez <agomez at igalia.com>
Acked-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6021>

---

 .gitlab-ci/bare-metal/init.sh   | 3 +++
 .gitlab-ci/prepare-artifacts.sh | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index b7d38d175c3..797f0d73e72 100755
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -16,6 +16,9 @@ export XDG_CACHE_HOME=/tmp
 
 echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
+# Overwrite traces.yml file with the baremetal version
+cp /install/traces-baremetal.yml /install/traces.yml
+
 if sh $BARE_METAL_TEST_SCRIPT; then
   OK=1
 else
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index 40e7bbb5046..a378b99929e 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -26,11 +26,8 @@ echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSIO
 cp -Rp .gitlab-ci/bare-metal install/
 cp -Rp .gitlab-ci/deqp* install/
 cp -Rp .gitlab-ci/piglit install/
-if [ -d /lava-files ]; then
-    cp -Rp .gitlab-ci/traces-baremetal.yml install/traces.yml
-else
-    cp -Rp .gitlab-ci/traces.yml install/
-fi
+cp -Rp .gitlab-ci/traces-baremetal.yml install/
+cp -Rp .gitlab-ci/traces.yml install/
 cp -Rp .gitlab-ci/tracie install/
 cp -Rp .gitlab-ci/tracie-runner-gl.sh install/
 cp -Rp .gitlab-ci/tracie-runner-vk.sh install/