All of lore.kernel.org
 help / color / mirror / Atom feed
From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH 3/4] gen_hosts: Add gen_hosts support for the nfstest workflow
Date: Wed, 10 Apr 2024 10:50:50 -0400	[thread overview]
Message-ID: <20240410145051.257980-3-cel@kernel.org> (raw)
In-Reply-To: <20240410145051.257980-1-cel@kernel.org>

From: Chuck Lever <chuck.lever@oracle.com>

Add functionality to generate the Ansible host inventory for the
nfstest workflow.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/gen_hosts/defaults/main.yml   |  1 +
 playbooks/roles/gen_hosts/tasks/main.yml      | 15 +++++++++
 .../roles/gen_hosts/templates/nfstest.j2      | 32 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 playbooks/roles/gen_hosts/templates/nfstest.j2

diff --git a/playbooks/roles/gen_hosts/defaults/main.yml b/playbooks/roles/gen_hosts/defaults/main.yml
index 5cd941c7d0d3..8fc0f2794506 100644
--- a/playbooks/roles/gen_hosts/defaults/main.yml
+++ b/playbooks/roles/gen_hosts/defaults/main.yml
@@ -26,6 +26,7 @@ kdevops_workflow_enable_cxl: False
 kdevops_workflow_enable_pynfs: False
 kdevops_workflow_enable_gitr: False
 kdevops_workflow_enable_ltp: False
+kdevops_workflow_enable_nfstest: false
 
 is_fstests: False
 fstests_fstyp: "bogus"
diff --git a/playbooks/roles/gen_hosts/tasks/main.yml b/playbooks/roles/gen_hosts/tasks/main.yml
index 86837e748134..a4dd1f5a0fc3 100644
--- a/playbooks/roles/gen_hosts/tasks/main.yml
+++ b/playbooks/roles/gen_hosts/tasks/main.yml
@@ -124,6 +124,21 @@
     - kdevops_workflow_enable_ltp
     - ansible_hosts_template.stat.exists
 
+- name: Generate the Ansible hosts file for dedicated nfstest workflow
+  tags: [ 'hosts' ]
+  vars:
+    nfstest_enabled_hosts: "{{ nfstest_enabled_test_groups | ansible.builtin.split }}"
+  template:
+    src: "{{ kdevops_hosts_template }}"
+    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    force: true
+    trim_blocks: true
+    lstrip_blocks: true
+  when:
+    - kdevops_workflows_dedicated_workflow
+    - kdevops_workflow_enable_nfstest
+    - ansible_hosts_template.stat.exists
+
 - name: Set empty enabled test types list for fstests
   tags: [ 'hosts' ]
   set_fact:
diff --git a/playbooks/roles/gen_hosts/templates/nfstest.j2 b/playbooks/roles/gen_hosts/templates/nfstest.j2
new file mode 100644
index 000000000000..c00494ca5aff
--- /dev/null
+++ b/playbooks/roles/gen_hosts/templates/nfstest.j2
@@ -0,0 +1,32 @@
+[all]
+{% 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_nfsd_enable %}
+[nfsd]
+{{ kdevops_hosts_prefix }}-nfsd
+[nfsd:vars]
+ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
+{% endif %}
-- 
2.44.0


  parent reply	other threads:[~2024-04-10 14:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-10 14:50 [PATCH 1/4] workflows: Workflow stub for Jorge Mora's nfstest suite cel
2024-04-10 14:50 ` [PATCH 2/4] gen_nodes: Add support for the nfstest workflow cel
2024-04-10 14:50 ` cel [this message]
2024-04-10 14:50 ` [PATCH 4/4] roles: Add a playbook to run the nfstest suite cel
2024-04-11 17:49   ` Luis Chamberlain
2024-04-11 18:05     ` Chuck Lever
2024-04-11 18:51       ` Luis Chamberlain
2024-04-11 19:25         ` Chuck Lever
2024-04-11 19:55           ` Luis Chamberlain
2024-04-12 15:34   ` Scott Mayhew
2024-04-12 15:36     ` Chuck Lever III
2024-04-10 14:56 ` [PATCH 1/4] workflows: Workflow stub for Jorge Mora's " Chuck Lever
2024-04-11 16:43 ` Luis Chamberlain
2024-04-11 17:41   ` Chuck Lever
2024-04-12 15:45 ` Scott Mayhew
2024-04-12 15:50   ` Chuck Lever III
2024-04-12 19:03     ` Chuck Lever III

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=20240410145051.257980-3-cel@kernel.org \
    --to=cel@kernel.org \
    --cc=chuck.lever@oracle.com \
    --cc=kdevops@lists.linux.dev \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.