From 6f9614c1872191f318638425a79049248bd10d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Thu, 4 Apr 2024 13:37:16 +0300 Subject: [PATCH] ci/b2c: Reduce the length of the kernel cmdline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The qcom boards I am about to introduce do not support long kernel cmdline, so reduce its size by making use of b2c's extra argument URL. Signed-off-by: Martin Roukala (né Peres) Signed-off-by: Eric Engestrom Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 29 +++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index dd872e9c894..29f15c7bdfc 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -47,21 +47,28 @@ console_patterns: deployment: # Initial boot start: + storage: + http: + - path: "/b2c-extra-args" + data: > + b2c.pipefail b2c.poweroff_delay={{ poweroff_delay }} + b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}" + b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve" + {% for volume in volumes %} + b2c.volume={{ volume }} + {% endfor %} + b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }} + 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 }}" kernel: url: '{{ kernel_url }}' + + # NOTE: b2c.cache_device should not be here, but this works around + # a limitation of b2c which will be removed in the next release cmdline: > SALAD.machine_id={{ '{{' }} machine_id }} - console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep - loglevel={{ log_level }} no_hash_pointers - b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }} - b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check" - b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }} - b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}" - b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve" -{% for volume in volumes %} - 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 }}" + console={{ '{{' }} local_tty_device }},115200 + b2c.cache_device=auto b2c.ntp_peer=10.42.0.1 + b2c.extra_args_url={{ '{{' }} job.http.url }}/b2c-extra-args {% if kernel_cmdline_extras is defined %} {{ kernel_cmdline_extras }} {% endif %}