From 61c76a3b369d7d880fa7f25fdfaf47b5e0f8fc24 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 28 Feb 2025 19:31:22 +0100 Subject: [PATCH] ci/b2c: set default value for B2C_TELEGRAF_IMAGE in the job Part-of: --- .gitlab-ci/b2c/generate_b2c.py | 2 +- .gitlab-ci/test/gitlab-ci.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py index cbffca5e20b..8b3cddd63b7 100755 --- a/.gitlab-ci/b2c/generate_b2c.py +++ b/.gitlab-ci/b2c/generate_b2c.py @@ -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']: diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index ac42062b090..f62ebcda08a 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -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