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

ci/b2c: set default value for B2C_TELEGRAF_IMAGE in the job

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33825>
This commit is contained in:
Eric Engestrom
2025-02-28 19:31:22 +01:00
committed by Marge Bot
parent ee050d7af3
commit 61c76a3b36
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/b2c/generate_b2c.py
View File

@@ -43,7 +43,7 @@ values['working_dir'] = environ['CI_PROJECT_DIR']
values['image_under_test'] = environ['IMAGE_UNDER_TEST']
values['machine_registration_image'] = environ['B2C_MACHINE_REGISTRATION_IMAGE']
values['telegraf_image'] = environ.get('TELEGRAF_IMAGE', "registry.freedesktop.org/gfx-ci/ci-tron/telegraf:latest")
values['telegraf_image'] = environ['B2C_TELEGRAF_IMAGE']
# Pull all our images through our proxy registry
for image in ['image_under_test', 'machine_registration_image', 'telegraf_image']:

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

@@ -360,6 +360,7 @@ yaml-toml-shell-py-test:
B2C_TIMEOUT_CONSOLE_ACTIVITY_RETRIES: 0
B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache,install/*,*/install/*,*/vkd3d-proton.cache*,vkd3d-proton.cache*,*.qpa"
B2C_MACHINE_REGISTRATION_IMAGE: "registry.freedesktop.org/gfx-ci/ci-tron/machine-registration:latest"
B2C_TELEGRAF_IMAGE: "registry.freedesktop.org/gfx-ci/ci-tron/telegraf:latest"
# As noted in the top description, we make a distinction between the
# container used by gitlab-runner to queue the work, and the container