diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 618b737c76c..822eae02355 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 4325dffc6ef..116e6a9824f 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -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