From 82557f9141c6bba1f996685f778c2cbd159aface Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Tue, 10 Dec 2024 10:52:29 +0200 Subject: [PATCH] ci/b2c: use the runner description rather than ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gitlab's runner ID is an integer while CI-Tron's is a string. Let's use the runner description in the job description since this is what CI-Tron expects. Signed-off-by: Martin Roukala (né Peres) Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 2 +- .gitlab-ci/b2c/generate_b2c.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index 8e80e8099f1..dedff0e44bd 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -2,7 +2,7 @@ version: 1 # Rules to match for a machine to qualify target: - id: '{{ ci_runner_id }}' + id: '{{ ci_runner_description }}' timeouts: diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py index 7c20feb17b1..fea12dcf192 100755 --- a/.gitlab-ci/b2c/generate_b2c.py +++ b/.gitlab-ci/b2c/generate_b2c.py @@ -37,7 +37,7 @@ env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])), template = env.get_template(path.basename(values['job_template'])) values['ci_job_id'] = environ['CI_JOB_ID'] -values['ci_runner_id'] = environ['CI_RUNNER_ID'] +values['ci_runner_description'] = environ['CI_RUNNER_DESCRIPTION'] values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl] values['working_dir'] = environ['CI_PROJECT_DIR']