Mesa (master): gitlab-ci: attach the Fossilize log file as artifact on failure
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 26 07:02:05 UTC 2020
Module: Mesa
Branch: master
Commit: 276e6d7bbce089e0556c8f9e6601edc1dd3b5daf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=276e6d7bbce089e0556c8f9e6601edc1dd3b5daf
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Thu Jun 25 11:21:12 2020 +0200
gitlab-ci: attach the Fossilize log file as artifact on failure
It might be help.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5627>
---
.gitlab-ci.yml | 5 +++++
.gitlab-ci/fossilize-runner.sh | 6 +++++-
.gitlab-ci/fossils/fossils.sh | 5 +++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daab01c86bb..92e006b324d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -802,6 +802,11 @@ piglit-quick_shader:
extends: .test-vk
script:
- ./install/fossilize-runner.sh
+ artifacts:
+ when: on_failure
+ name: "mesa_${CI_JOB_NAME}"
+ paths:
+ - results/
llvmpipe-gles2:
variables:
diff --git a/.gitlab-ci/fossilize-runner.sh b/.gitlab-ci/fossilize-runner.sh
index b2cd2f56e4b..c3528ac53ad 100755
--- a/.gitlab-ci/fossilize-runner.sh
+++ b/.gitlab-ci/fossilize-runner.sh
@@ -13,4 +13,8 @@ INSTALL=`pwd`/install
export LD_LIBRARY_PATH=`pwd`/install/lib/
export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.x86_64.json
-"$INSTALL/fossils/fossils.sh" "$INSTALL/fossils.yml"
+# To store Fossilize logs on failure.
+RESULTS=`pwd`/results
+mkdir -p results
+
+"$INSTALL/fossils/fossils.sh" "$INSTALL/fossils.yml" "$RESULTS"
diff --git a/.gitlab-ci/fossils/fossils.sh b/.gitlab-ci/fossils/fossils.sh
index 60394f7b2dc..0dffa4776f7 100755
--- a/.gitlab-ci/fossils/fossils.sh
+++ b/.gitlab-ci/fossils/fossils.sh
@@ -2,6 +2,7 @@
FOSSILS_SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
FOSSILS_YAML="$(readlink -f "$1")"
+FOSSILS_RESULTS="$2"
clone_fossils_db()
{
@@ -64,10 +65,10 @@ create_clean_git
for fossil in $(query_fossils_yaml fossils)
do
fetch_fossil "$fossil" || exit $?
- fossilize-replay --num-threads 4 $fossil 1>&2 2> fossil_replay.txt
+ fossilize-replay --num-threads 4 $fossil 1>&2 2> $FOSSILS_RESULTS/fossil_replay.txt
if [ $? != 0 ]; then
echo "Replay of $fossil failed"
- grep "pipeline crashed or hung" fossil_replay.txt
+ grep "pipeline crashed or hung" $FOSSILS_RESULTS/fossil_replay.txt
exit 1
fi
rm $fossil
More information about the mesa-commit
mailing list