diff options
| author | Emma Anholt <emma@anholt.net> | 2022-01-12 11:13:12 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-01-27 04:37:16 +0000 |
| commit | d562b83a844cbe2a12d7c5b5c883fa61cf79fcfd (patch) | |
| tree | 7e762e43d32fd049a01f6e217dc960449df1057d /.gitlab-ci/piglit | |
| parent | 7d6cd4a5cd37712b0e9769f7316fd20da16ae14c (diff) | |
ci/traces: Clean up the failure report message.
You really want to be reviewing the HTML summary with image diffs, not the
junit XML (though we do still generate it so you get the results in the
gitlab UI if that's how you like to interact with it).
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14604>
Diffstat (limited to '.gitlab-ci/piglit')
| -rwxr-xr-x | .gitlab-ci/piglit/piglit-traces.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 2845ed1670d..ff8d30a06af 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -186,8 +186,6 @@ if [ "$RUN_CMD_WRAPPER" ]; then RUN_CMD="set +e; $RUN_CMD_WRAPPER "$(/usr/bin/printf "%q" "$RUN_CMD")"; set -e" fi -FAILURE_MESSAGE=$(printf "%s" "Unexpected change in results:") - if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}" fi @@ -202,7 +200,6 @@ ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${ if [ ${PIGLIT_JUNIT_RESULTS:-0} -eq 1 ]; then ./piglit summary aggregate "$RESULTS" -o junit.xml - FAILURE_MESSAGE=$(printf "${FAILURE_MESSAGE}\n%s" "Check the JUnit report for failures at: ${ARTIFACTS_BASE_URL}/results/junit.xml") fi PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}" @@ -252,8 +249,6 @@ find "$RESULTS"/summary -type f -name "*.html" -print0 \ find "$RESULTS"/summary -type f -name "*.html" -print0 \ | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE}"'/%g' -FAILURE_MESSAGE=$(printf "${FAILURE_MESSAGE}\n%s" "Check the HTML summary for problems at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html") - -quiet print_red printf "%s\n" "$FAILURE_MESSAGE" quiet diff --color=always -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE +quiet print_red echo "Review the image changes and get the new checksums at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html" exit 1 |