ci: move setting python path for structured_logger.py to where it's actually used

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36685>
This commit is contained in:
Eric Engestrom 2025-08-07 12:03:02 +02:00 committed by Marge Bot
parent 2161b47d3f
commit b24709960d
2 changed files with 1 additions and 2 deletions

View file

@ -115,8 +115,6 @@ variables:
# Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
# NEVER MIX FARM MAINTENANCE WITH ANY OTHER CHANGE IN THE SAME MERGE REQUEST!
ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
# Python scripts for structured logger
PYTHONPATH: $CI_PROJECT_DIR/install
# No point in continuing once the device is lost
MESA_VK_ABORT_ON_DEVICE_LOSS: 1
# Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output

View file

@ -142,6 +142,7 @@ section_end prepare_rootfs
set +e
STRUCTURED_LOG_FILE=results/job_detail.json
export PYTHONPATH=$CI_INSTALL
python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
ATTEMPTS=3