From a0f350429baa47576f2461ab4a9ec5d34eebf5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Thu, 14 Dec 2023 13:31:12 +0200 Subject: [PATCH] ci/b2c: fix the `cmdline_extra` variable name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The variable name should have been named `kernel_cmdline_extra`, so let's rename it to match the expectations of the rest of Mesa. Fixes: 4362d5913f07 ("ci/b2c: import all variables starting with `B2C_`") Signed-off-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 4 ++-- .gitlab-ci/b2c/generate_b2c.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index 4ce5b12e1f0..e99e63b32f8 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -54,8 +54,8 @@ deployment: b2c.volume={{ volume }} {% endfor %} b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}" - {% if cmdline_extras is defined %} - {{ cmdline_extras }} + {% if kernel_cmdline_extras is defined %} + {{ kernel_cmdline_extras }} {% endif %} initramfs: diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py index d72d4890d43..7c20feb17b1 100755 --- a/.gitlab-ci/b2c/generate_b2c.py +++ b/.gitlab-ci/b2c/generate_b2c.py @@ -48,8 +48,8 @@ values['local_container'] = values['local_container'].replace( '{{ fdo_proxy_registry }}' ) -if 'cmdline_extras' not in values: - values['cmdline_extras'] = '' +if 'kernel_cmdline_extras' not in values: + values['kernel_cmdline_extras'] = '' with open(path.splitext(path.basename(values['job_template']))[0], "w") as f: f.write(template.render(values))