From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E800F16D317 for ; Wed, 10 Apr 2024 14:51:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712760668; cv=none; b=mLLkZrA07MxahUm1te8mYB0huHnK9ODXH7fTZnMNDfA/7C/7ebkRoQbhjKEAWDcplP5QjHOO3myz1QI8JDu9pq9T3CvsCBV22yelsKAEXABvDhCjdX6o6GhGSeh8f41Lurzp8ZyfCyUq5L81QqUDUXD4aYkD5xZn53+x6ib4At0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712760668; c=relaxed/simple; bh=n3oAaQ8FX8aFaZeywM3r946gXQNyyKBNndqiHS+7lEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mzwSw/pbNhYORVuXAwmMaDKGZ+ygsBhVGFn25NVk5yXdbRf7p0aZnwbh8kk+WjSuP5hsMFS9PBtfpy1oFH5mVsYjBrUX3A4RQRo9T6E5CQYTFZExxkLDt9+UA9d+TneO6gkeWPPbnHd2Q+/KVkw13VId+zTE0jJiECvDm3KY/2Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qy7PWb7u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Qy7PWb7u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45585C43390; Wed, 10 Apr 2024 14:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712760667; bh=n3oAaQ8FX8aFaZeywM3r946gXQNyyKBNndqiHS+7lEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qy7PWb7uZXCvWPrViDX9tPF7zdpmYb2mMd5pjGvKBg/Iift/SqBkLyJWvlJ/plIyt IBYAWYrv+v3GZ66wGqls67fJE7ALyUfuo8PcIgzXqQ+t0FKzDtjrfovlW7V5zJaWdq i1MzldA8hbSftan1hIgZRDyWT8dfiz4xEKPdO02evUYYV0FQUlQ4qhw87RCTRCGTdL T/I0e8QADS9EZB4y1oUUwUx1yRRc40LuLRJ0e3eahDw5wqMFpFsbB/YSwSo86hzOOo Q647yJ/xm4C8RNTlZ0NxsyoD3Rs4jjuzEY4szyd46OLe8qCrXwg8R4Ke+lNodxrLJd TYiO+dtW5iLFA== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH 3/4] gen_hosts: Add gen_hosts support for the nfstest workflow Date: Wed, 10 Apr 2024 10:50:50 -0400 Message-ID: <20240410145051.257980-3-cel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240410145051.257980-1-cel@kernel.org> References: <20240410145051.257980-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Add functionality to generate the Ansible host inventory for the nfstest workflow. Signed-off-by: Chuck Lever --- 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