* [PATCH 1/2] gen_hosts: remove legacy duplicate workflow templates
2025-09-09 0:50 [PATCH 0/2] gen_hosts: small fixes Luis Chamberlain
@ 2025-09-09 0:50 ` Luis Chamberlain
2025-09-09 0:50 ` [PATCH 2/2] gen_hosts: remove 'write-your-own-template' placeholder text Luis Chamberlain
1 sibling, 0 replies; 3+ messages in thread
From: Luis Chamberlain @ 2025-09-09 0:50 UTC (permalink / raw)
To: Chuck Lever, Daniel Gomez, kdevops; +Cc: Luis Chamberlain
The gen_hosts role has migrated to using a single generic hosts.j2
template that contains all workflow logic internally. The workflow-specific
templates at the top level (templates/*.j2) are legacy artifacts from
before this migration and are no longer used.
These duplicate templates can be safely removed because:
1. The system exclusively uses the generic hosts.j2 template as configured
in extra_vars.yaml (kdevops_hosts_template: hosts.j2)
2. The workflow-specific logic is now handled through conditional blocks
within the generic hosts.j2 template
3. These legacy templates are not referenced anywhere in the current
codebase
The files in templates/workflows/*.j2 remain as they represent the
modular workflow snippets, though they are also not actively used
in the current implementation.
Removed legacy templates:
- blktests.j2
- cxl.j2
- fio-tests.j2
- fstests.j2
- gitr.j2
- ltp.j2
- mmtests.j2
- nfstest.j2
- pynfs.j2
- selftests.j2
- sysbench.j2
Fixes: 40df5ef72d197 ("gen_hosts: use kdevops_workflow_name directly for template selection")
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
.../roles/gen_hosts/templates/blktests.j2 | 27 -----
playbooks/roles/gen_hosts/templates/cxl.j2 | 21 ----
.../roles/gen_hosts/templates/fio-tests.j2 | 28 -----
.../roles/gen_hosts/templates/fstests.j2 | 109 ------------------
playbooks/roles/gen_hosts/templates/gitr.j2 | 51 --------
playbooks/roles/gen_hosts/templates/ltp.j2 | 30 -----
.../roles/gen_hosts/templates/mmtests.j2 | 36 ------
.../roles/gen_hosts/templates/nfstest.j2 | 51 --------
playbooks/roles/gen_hosts/templates/pynfs.j2 | 34 ------
.../roles/gen_hosts/templates/selftests.j2 | 27 -----
.../roles/gen_hosts/templates/sysbench.j2 | 27 -----
11 files changed, 441 deletions(-)
delete mode 100644 playbooks/roles/gen_hosts/templates/blktests.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/cxl.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/fio-tests.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/fstests.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/gitr.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/ltp.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/mmtests.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/nfstest.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/pynfs.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/selftests.j2
delete mode 100644 playbooks/roles/gen_hosts/templates/sysbench.j2
diff --git a/playbooks/roles/gen_hosts/templates/blktests.j2 b/playbooks/roles/gen_hosts/templates/blktests.j2
deleted file mode 100644
index 6aa434c3..00000000
--- a/playbooks/roles/gen_hosts/templates/blktests.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for test_type in blktests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{% for test_type in blktests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for test_type in blktests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/cxl.j2 b/playbooks/roles/gen_hosts/templates/cxl.j2
deleted file mode 100644
index cab7da24..00000000
--- a/playbooks/roles/gen_hosts/templates/cxl.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-[all]
-localhost ansible_connection=local
-{{ kdevops_hosts_prefix }}
-{% if kdevops_baseline_and_dev == True %}
-{{ kdevops_hosts_prefix }}-dev
-{% endif %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{{ kdevops_hosts_prefix }}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_hosts_prefix }}-dev
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/fio-tests.j2 b/playbooks/roles/gen_hosts/templates/fio-tests.j2
deleted file mode 100644
index 75bc0c53..00000000
--- a/playbooks/roles/gen_hosts/templates/fio-tests.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-[all]
-localhost ansible_connection=local
-{{ kdevops_host_prefix }}-fio-tests
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-fio-tests-dev
-{% endif %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{{ kdevops_host_prefix }}-fio-tests
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-fio-tests-dev
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[fio_tests]
-{{ kdevops_host_prefix }}-fio-tests
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-fio-tests-dev
-{% endif %}
-[fio_tests:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/fstests.j2 b/playbooks/roles/gen_hosts/templates/fstests.j2
deleted file mode 100644
index 823dbb1e..00000000
--- a/playbooks/roles/gen_hosts/templates/fstests.j2
+++ /dev/null
@@ -1,109 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for s in fstests_enabled_test_types %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endif %}
-{% if kdevops_baseline_and_dev %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-{{ s }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
-{% endif %}
-{% endif %}
-{% endfor %}
-{% if kdevops_nfsd_enable %}
-{% if kdevops_loopback_nfs_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-{% endif %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{% for s in fstests_enabled_test_types %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endif %}
-{% endfor %}
-{% if kdevops_nfsd_enable %}
-{% if kdevops_loopback_nfs_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-{% endif %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for s in fstests_enabled_test_types %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-{{ s }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
-{% endif %}
- {% endfor %}
-{% if kdevops_nfsd_enable %}
-{% if kdevops_loopback_nfs_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-{% endif %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% if kdevops_enable_iscsi %}
-[iscsi]
-{{ kdevops_hosts_prefix }}-iscsi
-[iscsi:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_nfsd_enable %}
-[nfsd]
-{{ kdevops_hosts_prefix }}-nfsd
-[nfsd:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_smbd_enable %}
-[smbd]
-{{ kdevops_hosts_prefix }}-smbd
-[smbd:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_krb5_enable %}
-[kdc]
-{{ kdevops_hosts_prefix }}-kdc
-[kdc:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[krb5]
-{% for s in fstests_enabled_test_types %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endif %}
-{% endfor %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-[krb5:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_enable_iscsi or kdevops_nfsd_enable or kdevops_smbd_enable or kdevops_krb5_enable %}
-[service]
-{% if kdevops_enable_iscsi %}
-{{ kdevops_hosts_prefix }}-iscsi
-{% endif %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-{% if kdevops_smbd_enable %}
-{{ kdevops_hosts_prefix }}-smbd
-{% endif %}
-{% if kdevops_krb5_enable %}
-{{ kdevops_hosts_prefix }}-kdc
-{% endif %}
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
diff --git a/playbooks/roles/gen_hosts/templates/gitr.j2 b/playbooks/roles/gen_hosts/templates/gitr.j2
deleted file mode 100644
index 3f30a5fb..00000000
--- a/playbooks/roles/gen_hosts/templates/gitr.j2
+++ /dev/null
@@ -1,51 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for s in gitr_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[baseline]
-{% for s in gitr_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for s in gitr_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% if kdevops_enable_iscsi %}
-
-[iscsi]
-{{ kdevops_hosts_prefix }}-iscsi
-[iscsi:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_nfsd_enable %}
-
-[nfsd]
-{{ kdevops_hosts_prefix }}-nfsd
-[nfsd:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_enable_iscsi or kdevops_nfsd_enable %}
-[service]
-{% if kdevops_enable_iscsi %}
-{{ kdevops_hosts_prefix }}-iscsi
-{% endif %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
diff --git a/playbooks/roles/gen_hosts/templates/ltp.j2 b/playbooks/roles/gen_hosts/templates/ltp.j2
deleted file mode 100644
index 6946b3f3..00000000
--- a/playbooks/roles/gen_hosts/templates/ltp.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for s in ltp_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[baseline]
-{% for s in ltp_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for s in ltp_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/mmtests.j2 b/playbooks/roles/gen_hosts/templates/mmtests.j2
deleted file mode 100644
index 8df4a3c3..00000000
--- a/playbooks/roles/gen_hosts/templates/mmtests.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for test_type in mmtests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{% for test_type in mmtests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for test_type in mmtests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[mmtests]
-{% for test_type in mmtests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
-{% endif %}
-{% endfor %}
-[mmtests:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/nfstest.j2 b/playbooks/roles/gen_hosts/templates/nfstest.j2
deleted file mode 100644
index 709d871d..00000000
--- a/playbooks/roles/gen_hosts/templates/nfstest.j2
+++ /dev/null
@@ -1,51 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for s in nfstest_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[baseline]
-{% for s in nfstest_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for s in nfstest_enabled_hosts %}
-{{ kdevops_host_prefix }}-{{ s }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% if kdevops_enable_iscsi %}
-
-[iscsi]
-{{ kdevops_hosts_prefix }}-iscsi
-[iscsi:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_nfsd_enable %}
-
-[nfsd]
-{{ kdevops_hosts_prefix }}-nfsd
-[nfsd:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-{% if kdevops_enable_iscsi or kdevops_nfsd_enable %}
-[service]
-{% if kdevops_enable_iscsi %}
-{{ kdevops_hosts_prefix }}-iscsi
-{% endif %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_hosts_prefix }}-nfsd
-{% endif %}
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
diff --git a/playbooks/roles/gen_hosts/templates/pynfs.j2 b/playbooks/roles/gen_hosts/templates/pynfs.j2
deleted file mode 100644
index 55add4d1..00000000
--- a/playbooks/roles/gen_hosts/templates/pynfs.j2
+++ /dev/null
@@ -1,34 +0,0 @@
-[all]
-localhost ansible_connection=local
-{{ kdevops_hosts_prefix }}-nfsd
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{{ kdevops_hosts_prefix }}-nfsd
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-nfsd-dev
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% if kdevops_enable_iscsi %}
-[iscsi]
-{{ kdevops_hosts_prefix }}-iscsi
-[iscsi:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
-[nfsd]
-{{ kdevops_hosts_prefix }}-nfsd
-[nfsd:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% if true %}
-[service]
-{% if kdevops_enable_iscsi %}
-{{ kdevops_hosts_prefix }}-iscsi
-{% endif %}
-{{ kdevops_hosts_prefix }}-nfsd
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-{% endif %}
diff --git a/playbooks/roles/gen_hosts/templates/selftests.j2 b/playbooks/roles/gen_hosts/templates/selftests.j2
deleted file mode 100644
index af0d6b34..00000000
--- a/playbooks/roles/gen_hosts/templates/selftests.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for test_type in selftests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{% for test_type in selftests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for test_type in selftests_enabled_test_types %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/sysbench.j2 b/playbooks/roles/gen_hosts/templates/sysbench.j2
deleted file mode 100644
index e30773c1..00000000
--- a/playbooks/roles/gen_hosts/templates/sysbench.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-[all]
-localhost ansible_connection=local
-{% for test_type in enabled_sysbench_tests %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% if kdevops_baseline_and_dev %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
-{% endif %}
-{% endfor %}
-[all:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[baseline]
-{% for test_type in enabled_sysbench_tests %}
-{{ kdevops_host_prefix }}-{{ test_type }}
-{% endfor %}
-[baseline:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[dev]
-{% if kdevops_baseline_and_dev %}
- {% for test_type in enabled_sysbench_tests %}
-{{ kdevops_host_prefix }}-{{ test_type }}-dev
- {% endfor %}
-{% endif %}
-[dev:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
-[service]
-[service:vars]
-ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
--
2.50.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] gen_hosts: remove 'write-your-own-template' placeholder text
2025-09-09 0:50 [PATCH 0/2] gen_hosts: small fixes Luis Chamberlain
2025-09-09 0:50 ` [PATCH 1/2] gen_hosts: remove legacy duplicate workflow templates Luis Chamberlain
@ 2025-09-09 0:50 ` Luis Chamberlain
1 sibling, 0 replies; 3+ messages in thread
From: Luis Chamberlain @ 2025-09-09 0:50 UTC (permalink / raw)
To: Chuck Lever, Daniel Gomez, kdevops; +Cc: Luis Chamberlain, Daniel Gomez
During patch review, it was noted that the placeholder text
'write-your-own-template-for-...-workflow' was introduced in commit
71f085a4d77f ("kdevops: replace ansible hosts generation jinja2
templating") from kdevops-history and has been expanded to other
templates.
This placeholder text serves no functional purpose and should be
replaced with proper template structure. The cxl.j2 and pynfs.j2
workflow templates contained these placeholders which have now been
replaced with proper host definitions following the pattern used
by other workflow templates.
The templates now properly define:
- The workflow host in [all] section
- A [baseline] group with the workflow host
- A workflow-specific group ([cxl] or [pynfs]) with the host
- Proper ansible_python_interpreter variables for each group
This cleanup ensures consistency across all workflow templates.
Suggested-by: Daniel Gomez <da.gomez@kernel.org>
Fixes: 40df5ef72d197 ("gen_hosts: use kdevops_workflow_name directly for template selection")
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
.../roles/gen_hosts/templates/workflows/cxl.j2 | 14 +++++++++++++-
.../roles/gen_hosts/templates/workflows/pynfs.j2 | 14 +++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/playbooks/roles/gen_hosts/templates/workflows/cxl.j2 b/playbooks/roles/gen_hosts/templates/workflows/cxl.j2
index 53790f29..cf1e7083 100644
--- a/playbooks/roles/gen_hosts/templates/workflows/cxl.j2
+++ b/playbooks/roles/gen_hosts/templates/workflows/cxl.j2
@@ -1,7 +1,19 @@
{# Workflow template for CXL #}
[all]
localhost ansible_connection=local
-write-your-own-template-for-cxl-workflow
+{{ kdevops_host_prefix }}-cxl
[all:vars]
ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
+
+[baseline]
+{{ kdevops_host_prefix }}-cxl
+
+[baseline:vars]
+ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
+
+[cxl]
+{{ kdevops_host_prefix }}-cxl
+
+[cxl:vars]
+ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2 b/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2
index 6145b1a0..a93b8f06 100644
--- a/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2
+++ b/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2
@@ -1,7 +1,19 @@
{# Workflow template for pynfs #}
[all]
localhost ansible_connection=local
-write-your-own-template-for-pynfs-workflow
+{{ kdevops_host_prefix }}-pynfs
[all:vars]
ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
+
+[baseline]
+{{ kdevops_host_prefix }}-pynfs
+
+[baseline:vars]
+ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
+
+[pynfs]
+{{ kdevops_host_prefix }}-pynfs
+
+[pynfs:vars]
+ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
--
2.50.1
^ permalink raw reply related [flat|nested] 3+ messages in thread