Module: Mesa Branch: main Commit: d173584b6e41f64ba96530869c17f4fd5cbdbb98 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d173584b6e41f64ba96530869c17f4fd5cbdbb98
Author: Eric Engestrom <[email protected]> Date: Wed Aug 16 21:08:34 2023 +0100 ci/deqp-runner: turn paths in errors into links Suggested-by: Emma Anholt <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26177> --- .gitlab-ci/deqp-runner.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 5b90b1ff5a3..163b267ba45 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -168,8 +168,10 @@ uncollapsed_section_switch deqp "deqp: deqp-runner" cat /deqp/version-log -set +e +ARTIFACTS_URL_PREFIX="https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts"; + if [ -z "$DEQP_SUITE" ]; then + set +e deqp-runner \ run \ --deqp $DEQP \ @@ -182,11 +184,14 @@ if [ -z "$DEQP_SUITE" ]; then $DEQP_RUNNER_OPTIONS \ -- \ $DEQP_OPTIONS + echo $? > /tmp/deqp-exit-code + set -e else # If you change the format of the suite toml filenames or the # $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest # of the tree for other places that need to be kept in sync (e.g. # src/amd/ci/gitlab-ci-inc.yml) + set +e deqp-runner \ suite \ --suite $INSTALL/deqp-$DEQP_SUITE.toml \ @@ -198,10 +203,13 @@ else --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \ --jobs ${FDO_CI_CONCURRENT:-4} \ $DEQP_RUNNER_OPTIONS -fi + echo $? > /tmp/deqp-exit-code + set -e +fi 2>&1 | sed \ + -e "s,\"/builds/$CI_PROJECT_PATH/\(results/[^\"]\+.log\)\",$ARTIFACTS_URL_PREFIX/\1.txt,g" \ + -e "s,\"/builds/$CI_PROJECT_PATH/\(results/[^\"]\*\)\",$ARTIFACTS_URL_PREFIX/\1,g" -DEQP_EXITCODE=$? -set -e +DEQP_EXITCODE=$(cat /tmp/deqp-exit-code) set +x @@ -227,7 +235,7 @@ deqp-runner junit \ --results $RESULTS/failures.csv \ --output $RESULTS/junit.xml \ --limit 50 \ - --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"; + --template "See $ARTIFACTS_URL_PREFIX/results/{{testcase}}.xml" # Report the flakes to the IRC channel for monitoring (if configured): if [ -n "$FLAKES_CHANNEL" ]; then
