KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@collabora.com>
Fixes: dcd171f5e9 ("gitlab-ci: More stable URL for kernel and ramdisk artifacts, for LAVA")
Acked-by: Andres Gomez <agomez@igalia.com>
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6021>
This commit is contained in:
Tomeu Vizoso 2020-07-21 15:46:06 +02:00 committed by Marge Bot
parent 262731be43
commit 292882f6bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/bare-metal/init.sh
View File

@ -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

7
.gitlab-ci/prepare-artifacts.sh
View File

@ -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/