ci/ci-tron: replace crude dump of env vars with reproducible job script
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34962>
This commit is contained in:
+2
-2
@@ -128,12 +128,12 @@ variables:
|
||||
KERNEL_IMAGE_BASE: "https://$S3_HOST/$S3_KERNEL_BUCKET/$KERNEL_REPO/$KERNEL_TAG"
|
||||
|
||||
CI_TRON_JOB_TEMPLATE_PROJECT: &ci-tron-template-project gfx-ci/ci-tron
|
||||
CI_TRON_JOB_TEMPLATE_COMMIT: &ci-tron-template-commit e4ab9c5ecc941c7893d991cf723cde877b5dca8d
|
||||
CI_TRON_JOB_TEMPLATE_COMMIT: &ci-tron-template-commit ddadab0006e43f1365cd30779f565b444a6538ee
|
||||
CI_TRON_JOB_TEMPLATE_PROJECT_URL: "https://gitlab.freedesktop.org/$CI_TRON_JOB_TEMPLATE_PROJECT"
|
||||
|
||||
|
||||
default:
|
||||
timeout: 1m # catch any jobs which don't specify a timeout
|
||||
timeout: 1m # catch any jobs which don't specify a timeout
|
||||
id_tokens:
|
||||
S3_JWT:
|
||||
aud: https://s3.freedesktop.org
|
||||
|
||||
@@ -410,6 +410,9 @@ yaml-toml-shell-py-test:
|
||||
|
||||
# Assume by default this is running deqp, as that's almost always true
|
||||
HWCI_TEST_SCRIPT: install/deqp-runner.sh
|
||||
|
||||
# Keep the job script in the artifacts
|
||||
CI_TRON_JOB_SCRIPT_PATH: results/job_script.sh
|
||||
needs:
|
||||
- !reference [.required-for-hardware-jobs, needs]
|
||||
tags:
|
||||
@@ -431,15 +434,9 @@ yaml-toml-shell-py-test:
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
# Open a section that will be closed by b2c
|
||||
echo -e "\n\e[0Ksection_start:`date +%s`:b2c_kernel_boot[collapsed=true]\r\e[0K\e[0;36m[$(cut -d ' ' -f1 /proc/uptime)]: Submitting the CI-tron job and booting the DUT\e[0m\n"
|
||||
|
||||
# Print all the variables, for debugging and for easier reproducibility.
|
||||
# Note: a better solution will be implemented soon, but this is enough
|
||||
# for now.
|
||||
printenv
|
||||
|
||||
# Anything our job places in results/ will be collected by the
|
||||
# Gitlab coordinator for status presentation. results/junit.xml
|
||||
# will be parsed by the UI for more detailed explanations of
|
||||
|
||||
Reference in New Issue
Block a user