NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ci/b2c: fix the cmdline_extra variable name

Browse source 
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: 4362d5913f ("ci/b2c: import all variables starting with `B2C_`")
Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26686>
This commit is contained in:
Martin Roukala (né Peres) 2023-12-14 13:31:12 +02:00 • committed by Marge Bot
parent 1ef5feac5e
commit a0f350429b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
View file

@ -54,8 +54,8 @@ deployment:
b2c.volume={{ volume }} b2c.volume={{ volume }}
{% endfor %} {% 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 }}" 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 %} {% if kernel_cmdline_extras is defined %}
{{ cmdline_extras }} {{ kernel_cmdline_extras }}
{% endif %} {% endif %}
initramfs: initramfs:

4
.gitlab-ci/b2c/generate_b2c.py
View file

@ -48,8 +48,8 @@ values['local_container'] = values['local_container'].replace(
'{{ fdo_proxy_registry }}' '{{ fdo_proxy_registry }}'
) )
if 'cmdline_extras' not in values: if 'kernel_cmdline_extras' not in values:
values['cmdline_extras'] = '' values['kernel_cmdline_extras'] = ''
with open(path.splitext(path.basename(values['job_template']))[0], "w") as f: with open(path.splitext(path.basename(values['job_template']))[0], "w") as f:
f.write(template.render(values)) f.write(template.render(values))