From 7c4aa492c59a630625b3b24a3e0d7a26f79ae166 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 4 Dec 2025 23:43:30 -0500 Subject: [PATCH 1/3] gen_hosts: Disable WORKFLOWS_TESTS when BOOTLINUX_BUILDER is enabled A user can enable WORKFLOWS_TESTS alongside BOOTLINUX_BUILDER, which prevents KDEVOPS_WORKFLOW_NAME from being set to "linux". This causes the wrong hosts template to be selected, generating an unusable hosts file. Adding a dependency on !BOOTLINUX_BUILDER to WORKFLOWS_TESTS ensures the two options are mutually exclusive. Generated-by: Claude AI Fixes: 40df5ef72d19 ("gen_hosts: use kdevops_workflow_name directly for template selection") Signed-off-by: Chuck Lever --- kconfigs/workflows/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/kconfigs/workflows/Kconfig b/kconfigs/workflows/Kconfig index 1b583094f..001f31a9b 100644 --- a/kconfigs/workflows/Kconfig +++ b/kconfigs/workflows/Kconfig @@ -74,6 +74,7 @@ endif # WORKFLOW_LINUX_PACKAGED config WORKFLOWS_TESTS bool "Enable selection of test workflows" + depends on !BOOTLINUX_BUILDER default n if WORKFLOWS_TESTS From 715b64058a7b1da37526aaa22c3dea9638326226 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 4 Dec 2025 23:33:49 -0500 Subject: [PATCH 2/3] gen_hosts: fix separate kernel builder workflow The linux.j2 template uses kdevops_hosts_prefix but should use kdevops_host_prefix to match all other workflow templates. The former is a role default with a static value of "kdevops", while the latter comes from Kconfig and reflects the user's configured host prefix. This typo causes the generated hosts file to always use "kdevops-builder" regardless of the configured KDEVOPS_HOST_PREFIX. Fixes: 24c71ee8da96 ("gen_hosts: Get the 'separate kernel builder' workflow working again") Generated-by: Claude AI Signed-off-by: Chuck Lever --- playbooks/roles/gen_hosts/templates/workflows/linux.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 b/playbooks/roles/gen_hosts/templates/workflows/linux.j2 index 6a1459d87..63032ada2 100644 --- a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 +++ b/playbooks/roles/gen_hosts/templates/workflows/linux.j2 @@ -1,12 +1,12 @@ {# Template for the kernel builder workflow #} [all] localhost ansible_connection=local -{{ kdevops_hosts_prefix }}-builder +{{ kdevops_host_prefix }}-builder [all:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" [baseline] -{{ kdevops_hosts_prefix }}-builder +{{ kdevops_host_prefix }}-builder [baseline:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" From 727ab4e487578665c80bac4673fc4aae63d6a2dc Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 4 Dec 2025 23:45:21 -0500 Subject: [PATCH 3/3] gen_hosts: remove unused builder.j2 template The builder.j2 template became orphaned when commit 40df5ef72d19 refactored template selection to use workflows/.j2 files. The workflows/linux.j2 template now serves this purpose. Remove the dead code. Generated-by: Claude AI Signed-off-by: Chuck Lever --- playbooks/roles/gen_hosts/templates/builder.j2 | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 playbooks/roles/gen_hosts/templates/builder.j2 diff --git a/playbooks/roles/gen_hosts/templates/builder.j2 b/playbooks/roles/gen_hosts/templates/builder.j2 deleted file mode 100644 index 164201dc5..000000000 --- a/playbooks/roles/gen_hosts/templates/builder.j2 +++ /dev/null @@ -1,18 +0,0 @@ -[all] -localhost ansible_connection=local -{{ kdevops_hosts_prefix }}-builder -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[baseline] -{{ kdevops_hosts_prefix }}-builder -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[dev] -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}"