OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/deqp-runner: turn paths in errors into links

Browse Source 
Suggested-by: Emma Anholt <emma@anholt.net>
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26177>
This commit is contained in:
Eric Engestrom
2023-08-16 21:08:34 +01:00
committed by Marge Bot
parent 1ff4687e86
commit d173584b6e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci/deqp-runner.sh
View File

@@ -168,8 +168,10 @@ uncollapsed_section_switch deqp "deqp: deqp-runner"
cat /deqp/version-log 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 if [ -z "$DEQP_SUITE" ]; then
set +e
deqp-runner \ deqp-runner \
run \ run \
--deqp $DEQP \ --deqp $DEQP \
@@ -182,11 +184,14 @@ if [ -z "$DEQP_SUITE" ]; then
$DEQP_RUNNER_OPTIONS \ $DEQP_RUNNER_OPTIONS \
-- \ -- \
$DEQP_OPTIONS $DEQP_OPTIONS
echo $? > /tmp/deqp-exit-code
set -e
else else
# If you change the format of the suite toml filenames or the # If you change the format of the suite toml filenames or the
# $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest # $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. # of the tree for other places that need to be kept in sync (e.g.
# src/amd/ci/gitlab-ci-inc.yml) # src/amd/ci/gitlab-ci-inc.yml)
set +e
deqp-runner \ deqp-runner \
suite \ suite \
--suite $INSTALL/deqp-$DEQP_SUITE.toml \ --suite $INSTALL/deqp-$DEQP_SUITE.toml \
@@ -198,10 +203,13 @@ else
--fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \ --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
--jobs ${FDO_CI_CONCURRENT:-4} \ --jobs ${FDO_CI_CONCURRENT:-4} \
$DEQP_RUNNER_OPTIONS $DEQP_RUNNER_OPTIONS
fi echo $? > /tmp/deqp-exit-code
DEQP_EXITCODE=$?
set -e 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=$(cat /tmp/deqp-exit-code)
set +x set +x
@@ -227,7 +235,7 @@ deqp-runner junit \
--results $RESULTS/failures.csv \ --results $RESULTS/failures.csv \
--output $RESULTS/junit.xml \ --output $RESULTS/junit.xml \
--limit 50 \ --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): # Report the flakes to the IRC channel for monitoring (if configured):
if [ -n "$FLAKES_CHANNEL" ]; then if [ -n "$FLAKES_CHANNEL" ]; then