From: Daniel Gomez <da.gomez@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>
Cc: kdevops@lists.linux.dev, Daniel Gomez <da.gomez@kernel.org>,
Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 6/8] gen_hosts: make the linux workflow node name follow bootlinux_builder
Date: Thu, 23 Apr 2026 00:16:47 +0200 [thread overview]
Message-ID: <20260423-kdevops-series-a-fixes-v1-6-69a82d0e1631@samsung.com> (raw)
In-Reply-To: <20260423-kdevops-series-a-fixes-v1-0-69a82d0e1631@samsung.com>
From: Daniel Gomez <da.gomez@samsung.com>
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: 3089c3fec57 ("nixos: add NixOS support as third bringup option with libvirt integration")
Generated-by: Claude AI
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
playbooks/roles/gen_hosts/templates/workflows/linux.j2 | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
index 47c20ab8..79a11757 100644
--- a/playbooks/roles/gen_hosts/templates/workflows/linux.j2
+++ b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
@@ -1,12 +1,23 @@
-{# Template for the kernel builder workflow #}
+{# Template for the bootlinux workflow.
+
+ When bootlinux_builder is set, a dedicated build node carries the
+ -builder suffix (matching gen_nodes' builder_nodes list). Otherwise
+ the node takes the generic prefix-only name that gen_nodes emits
+ as generic_nodes.
+#}
+{% 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_baseline_python_interpreter }}"
--
2.53.0
next prev parent reply other threads:[~2026-04-22 22:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-22 22:16 [PATCH 0/8] kdevops: small NIXOS and gen_hosts fixes Daniel Gomez
2026-04-22 22:16 ` [PATCH 1/8] nixos: remove duplicate nixos_channel extra-var from Makefile Daniel Gomez
2026-04-22 22:16 ` [PATCH 2/8] nixos: do not emit comment-only recipe lines under $(Q) Daniel Gomez
2026-04-22 22:16 ` [PATCH 3/8] nixos: drop hardcoded qxl video model from libvirt XML Daniel Gomez
2026-04-22 22:16 ` [PATCH 4/8] nixos: destroy the libvirt domain before cleaning up local artefacts Daniel Gomez
2026-04-22 22:16 ` [PATCH 5/8] gen_hosts: scope the python interpreter per inventory group Daniel Gomez
2026-04-22 22:16 ` Daniel Gomez [this message]
2026-04-22 22:16 ` [PATCH 7/8] defconfigs/nixos: name NIXOS hosts with the "nixos" prefix Daniel Gomez
2026-04-22 22:16 ` [PATCH 8/8] gen_hosts: drop sudo become on inventory owner refresh Daniel Gomez
2026-04-23 13:50 ` [PATCH 0/8] kdevops: small NIXOS and gen_hosts fixes Chuck Lever
2026-04-23 19:20 ` Daniel Gomez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260423-kdevops-series-a-fixes-v1-6-69a82d0e1631@samsung.com \
--to=da.gomez@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=da.gomez@samsung.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox