[PATCH] gen_hosts: make the linux workflow node name follow bootlinux_builder
Daniel Gomez <[email protected]> Tue, 19 May 2026 15:41:46 +0200
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <20260519-b4-gen_hosts-linux-builder-fix-v1-1-5d0427648cf5@samsung.com> |
From: Daniel Gomez <[email protected]> workflows/linux.j2 hardcoded <prefix>-builder as the node name regardless of whether a dedicated builder was requested. Everywhere else in kdevops the convention is <prefix>-builder when bootlinux_builder is set and <prefix> otherwise, and gen_nodes already emits names along that rule. The template produced inventory entries gen_nodes did not cover; fix it so both sides agree. Fixes: 24c71ee8da96 ("gen_hosts: Get the 'separate kernel builder' workflow working again") Generated-by: Claude AI Signed-off-by: Daniel Gomez <[email protected]> --- The kernel-builder workflow template hardcoded a -builder suffix on the inventory hostname regardless of whether BOOTLINUX_BUILDER was selected. gen_nodes only adds -builder when BOOTLINUX_BUILDER=y; the template therefore disagreed with gen_nodes whenever a user picked 9P-build or any other non-builder bootlinux mode. The resulting inventory pointed at a hostname for which gen_nodes never wrote a guest XML, so `make bringup` failed with FileNotFoundError on the libvirt define step. --- playbooks/roles/gen_hosts/templates/workflows/linux.j2 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 b/playbooks/roles/gen_hosts/templates/workflows/linux.j2 index 63032ada..cdbfe78d 100644 --- a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 +++ b/playbooks/roles/gen_hosts/templates/workflows/linux.j2 @@ -1,12 +1,17 @@ -{# Template for the kernel builder workflow #} +{# Template for the bootlinux workflow #} +{% if bootlinux_builder | default(false) %} +{% set node_name = kdevops_host_prefix + '-builder' %} +{% else %} +{% set node_name = kdevops_host_prefix %} +{% endif %} [all] localhost ansible_connection=local -{{ kdevops_host_prefix }}-builder +{{ node_name }} [all:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" [baseline] -{{ kdevops_host_prefix }}-builder +{{ node_name }} [baseline:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" --- base-commit: 1a61f43dc2bc2e019fc4a35d9673cfa31909272d change-id: 20260519-b4-gen_hosts-linux-builder-fix-90112d0162fe Best regards, -- Daniel Gomez <[email protected]>