diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e902d71c64b..1a963f392ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1289,7 +1289,6 @@ debian-mingw32-x86_64: variables: 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_JUNIT_RESULTS: 1 CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition script: - install/piglit/piglit-traces.sh diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 0ac02f852b7..4d9bd8ec505 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -72,7 +72,6 @@ for var in \ PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \ PAN_MESA_DEBUG \ PIGLIT_FRACTION \ - PIGLIT_JUNIT_RESULTS \ PIGLIT_NO_WINDOW \ PIGLIT_OPTIONS \ PIGLIT_PLATFORM \ diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 13dcf0efea2..b50fc7a902c 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -196,9 +196,7 @@ fi 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 -fi +./piglit summary aggregate "$RESULTS" -o junit.xml PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}" RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt" diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml index 11db1852fc1..285c957bd0e 100644 --- a/src/gallium/drivers/iris/ci/gitlab-ci.yml +++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml @@ -150,14 +150,12 @@ iris-amly-piglit: PIGLIT_NO_WINDOW: 0 PIGLIT_PLATFORM: mixed_glx_egl PIGLIT_PROFILES: gpu - PIGLIT_JUNIT_RESULTS: 1 .iris-traces: extends: - .lava-traces-base variables: EGL_PLATFORM: surfaceless - PIGLIT_JUNIT_RESULTS: 1 PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}" PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml" diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml index 74ad892a02e..86f69d05c18 100644 --- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml +++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml @@ -29,7 +29,6 @@ radeonsi-stoney-traces:amd64: - .radeonsi-stoney-test:amd64 variables: EGL_PLATFORM: surfaceless - PIGLIT_JUNIT_RESULTS: 1 PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml" PIGLIT_REPLAY_EXTRA_ARGS: --keep-image tags: @@ -43,7 +42,6 @@ radeonsi-stoney-piglit-gl:amd64: PIGLIT_FRACTION: 4 PIGLIT_PLATFORM: mixed_glx_egl PIGLIT_PROFILES: quick_gl - PIGLIT_JUNIT_RESULTS: 1 HWCI_START_XORG: 1 radeonsi-stoney-va:amd64: diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 2c20ef1fb92..6d57d3cfb81 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -51,7 +51,6 @@ panfrost-t760-traces:armhf: MESA_GL_VERSION_OVERRIDE: "3.3" MESA_GLSL_VERSION_OVERRIDE: 330 EGL_PLATFORM: surfaceless - PIGLIT_JUNIT_RESULTS: 1 PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml" PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image" tags: @@ -90,7 +89,6 @@ panfrost-t860-traces:arm64: MESA_GL_VERSION_OVERRIDE: "3.3" MESA_GLSL_VERSION_OVERRIDE: 330 EGL_PLATFORM: surfaceless - PIGLIT_JUNIT_RESULTS: 1 PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml" PIGLIT_REPLAY_EXTRA_ARGS: --keep-image