From 68143c7b65bca8783a8f573a3e9371db71c336eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Mon, 16 Dec 2024 09:36:40 +0200 Subject: [PATCH] ci/b2c: run the machine registration check before the test container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a regression I introduced in 6f9614c18721 and it took me until now to realize :o Fixes: 6f9614c18721 ("ci/b2c: Reduce the length of the kernel cmdline") Signed-off-by: Martin Roukala (né Peres) (cherry picked from commit 564aea509ab827fe7c66ddd59ef5b084521a3b74) Conflicts: .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 Part-of: --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 1 + .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index 2a8ab671f62..50d613fc6e9 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -60,6 +60,7 @@ deployment: 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.run="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check" 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 | replace('"', '\\\"') }}" kernel: {% if kernel_url %} diff --git a/.pick_status.json b/.pick_status.json index 0383aacf73d..521e7d61307 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -414,7 +414,7 @@ "description": "ci/b2c: run the machine registration check before the test container", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6f9614c1872191f318638425a79049248bd10d4d", "notes": null