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

ci/traces: Always generate the junit XML. 

While it's not the primary interface to interpreting trace job failures,
it was set in all the traces jobs it looks like and it's low cost anyway.

Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14604>
This commit is contained in:
Emma Anholt 2022-01-12 11:27:03 -08:00 committed by Marge Bot
parent 60f7bd3c09
commit af957d4a17
6 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -1289,7 +1289,6 @@ debian-mingw32-x86_64:
variables: variables:
CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt-file=${CI_JOB_JWT_FILE} PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt-file=${CI_JOB_JWT_FILE}
PIGLIT_JUNIT_RESULTS: 1
CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition
script: script:
- install/piglit/piglit-traces.sh - install/piglit/piglit-traces.sh

1
.gitlab-ci/common/generate-env.sh
View File

@ -72,7 +72,6 @@ for var in \
PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \ PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
PAN_MESA_DEBUG \ PAN_MESA_DEBUG \
PIGLIT_FRACTION \ PIGLIT_FRACTION \
PIGLIT_JUNIT_RESULTS \
PIGLIT_NO_WINDOW \ PIGLIT_NO_WINDOW \
PIGLIT_OPTIONS \ PIGLIT_OPTIONS \
PIGLIT_PLATFORM \ PIGLIT_PLATFORM \

4
.gitlab-ci/piglit/piglit-traces.sh
View File

@ -196,9 +196,7 @@ fi
ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts" ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts"
if [ ${PIGLIT_JUNIT_RESULTS:-0} -eq 1 ]; then ./piglit summary aggregate "$RESULTS" -o junit.xml
./piglit summary aggregate "$RESULTS" -o junit.xml
fi
PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}" PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}"
RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt" RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt"

2
src/gallium/drivers/iris/ci/gitlab-ci.yml
View File

@ -150,14 +150,12 @@ iris-amly-piglit:
PIGLIT_NO_WINDOW: 0 PIGLIT_NO_WINDOW: 0
PIGLIT_PLATFORM: mixed_glx_egl PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: gpu PIGLIT_PROFILES: gpu
PIGLIT_JUNIT_RESULTS: 1
.iris-traces: .iris-traces:
extends: extends:
- .lava-traces-base - .lava-traces-base
variables: variables:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_JUNIT_RESULTS: 1
PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}" PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml"

2
src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
View File

@ -29,7 +29,6 @@ radeonsi-stoney-traces:amd64:
- .radeonsi-stoney-test:amd64 - .radeonsi-stoney-test:amd64
variables: variables:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_JUNIT_RESULTS: 1
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
tags: tags:
@ -43,7 +42,6 @@ radeonsi-stoney-piglit-gl:amd64:
PIGLIT_FRACTION: 4 PIGLIT_FRACTION: 4
PIGLIT_PLATFORM: mixed_glx_egl PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: quick_gl PIGLIT_PROFILES: quick_gl
PIGLIT_JUNIT_RESULTS: 1
HWCI_START_XORG: 1 HWCI_START_XORG: 1
radeonsi-stoney-va:amd64: radeonsi-stoney-va:amd64:

2
src/panfrost/ci/gitlab-ci.yml
View File

@ -51,7 +51,6 @@ panfrost-t760-traces:armhf:
MESA_GL_VERSION_OVERRIDE: "3.3" MESA_GL_VERSION_OVERRIDE: "3.3"
MESA_GLSL_VERSION_OVERRIDE: 330 MESA_GLSL_VERSION_OVERRIDE: 330
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_JUNIT_RESULTS: 1
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image" PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image"
tags: tags:
@ -90,7 +89,6 @@ panfrost-t860-traces:arm64:
MESA_GL_VERSION_OVERRIDE: "3.3" MESA_GL_VERSION_OVERRIDE: "3.3"
MESA_GLSL_VERSION_OVERRIDE: 330 MESA_GLSL_VERSION_OVERRIDE: 330
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_JUNIT_RESULTS: 1
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image PIGLIT_REPLAY_EXTRA_ARGS: --keep-image