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

ci/ci-tron: replace crude dump of env vars with reproducible job script

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34962>
This commit is contained in:
Eric Engestrom
2025-05-12 16:27:22 +02:00
parent fef1174b00
commit fd8d8264e0
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -128,12 +128,12 @@ variables:
KERNEL_IMAGE_BASE: "https://$S3_HOST/$S3_KERNEL_BUCKET/$KERNEL_REPO/$KERNEL_TAG" 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_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" CI_TRON_JOB_TEMPLATE_PROJECT_URL: "https://gitlab.freedesktop.org/$CI_TRON_JOB_TEMPLATE_PROJECT"
default: 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: id_tokens:
S3_JWT: S3_JWT:
aud: https://s3.freedesktop.org aud: https://s3.freedesktop.org

9
.gitlab-ci/test/gitlab-ci.yml
View File

@@ -410,6 +410,9 @@ yaml-toml-shell-py-test:
# Assume by default this is running deqp, as that's almost always true # Assume by default this is running deqp, as that's almost always true
HWCI_TEST_SCRIPT: install/deqp-runner.sh HWCI_TEST_SCRIPT: install/deqp-runner.sh
# Keep the job script in the artifacts
CI_TRON_JOB_SCRIPT_PATH: results/job_script.sh
needs: needs:
- !reference [.required-for-hardware-jobs, needs] - !reference [.required-for-hardware-jobs, needs]
tags: tags:
@@ -431,15 +434,9 @@ yaml-toml-shell-py-test:
fi fi
done done
# Open a section that will be closed by b2c # 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" 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 # Anything our job places in results/ will be collected by the
# Gitlab coordinator for status presentation. results/junit.xml # Gitlab coordinator for status presentation. results/junit.xml
# will be parsed by the UI for more detailed explanations of # will be parsed by the UI for more detailed explanations of