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 96AD315ECF7 for ; Wed, 10 Apr 2024 14:51:06 +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=1712760666; cv=none; b=al0hrRv4MPKQ08c/fhCtQ+4kS6ckYXT1MqZUaVEC0wYxuskBlGxnf9XCIGFPJqi5caU8YFkCraHnL660oaXi/iEyID3lhhFRXsWSI639tVdTL/flGZLubilW8NUMD2+CexUD8et30LEQFlhd2xGW5ZtCUtoK1wn5lRHld/ghcVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712760666; c=relaxed/simple; bh=8MFq5SH935ENwa5axo5LF4AlJfSNFu9gg1QkxlcPpc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ciT0FaUEg09J8EjRSrmYrADdclkZLjEyRADjQvM5SOVYXl/CutPkZkZ1/GxCN8dcev+u/jsSYo068wgI+hiB6TKJ7ZPZ6nq3g1/BE70ZPTSMAWf+itXigdtVw8lSP2dOmUhmbhf/FFRbj0w03S0KbB+Fr3YknLFykR+2rEHYn8Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QbeQtO3d; 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="QbeQtO3d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8577C43390; Wed, 10 Apr 2024 14:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712760666; bh=8MFq5SH935ENwa5axo5LF4AlJfSNFu9gg1QkxlcPpc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QbeQtO3d7n3nB6gAy/fXQIWp1S4SNudqIzWMu87pnSMCDWqznV61sSWjTNXxpF4H4 Pxek9pZw45P7bK6708LSoDJS+vMAMqBOiZq9N3svYRXkpsopustaMgMa376pdDCp9E FwmFe36RsJyzakD+nboHo/4jdLlGjqABZs9FvOF3j17J0LWrYZyRlhp8UZ0KIs8IsG EQEl6RyfCimeMRxSNTEs+yD85bLtP5Y9gagm0EWd3HNA8+d38d5m+7STsOEUfJEiOU +3NVCINx+uhSdd7QCtpWGHRmYU+lCgL1nWR28AMDxD7+ZUCQWpMyQ9w3iphJWnaYdx iZ1N6KDF+2Fgw== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH 2/4] gen_nodes: Add support for the nfstest workflow Date: Wed, 10 Apr 2024 10:50:49 -0400 Message-ID: <20240410145051.257980-2-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 provision target nodes for the nfstest workflow. Signed-off-by: Chuck Lever --- playbooks/roles/gen_nodes/defaults/main.yml | 1 + playbooks/roles/gen_nodes/tasks/main.yml | 10 ++++++++ playbooks/roles/gen_nodes/tasks/nfstest.yml | 28 +++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 playbooks/roles/gen_nodes/tasks/nfstest.yml diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml index d03306baec6e..5caada07fe59 100644 --- a/playbooks/roles/gen_nodes/defaults/main.yml +++ b/playbooks/roles/gen_nodes/defaults/main.yml @@ -12,6 +12,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 kdevops_workflow_enable_selftests: False kdevops_nfsd_enable: False kdevops_krb5_enable: False diff --git a/playbooks/roles/gen_nodes/tasks/main.yml b/playbooks/roles/gen_nodes/tasks/main.yml index ee175f4de506..a40e2bd92ccd 100644 --- a/playbooks/roles/gen_nodes/tasks/main.yml +++ b/playbooks/roles/gen_nodes/tasks/main.yml @@ -215,6 +215,16 @@ when: - is_ltp|bool +- name: Generate a kdevops nodes file for the nfstest workflow + tags: hosts + ansible.builtin.include_role: + name: gen_nodes + tasks_from: nfstest + when: + - kdevops_workflows_dedicated_workflow + - kdevops_workflow_enable_nfstest + - ansible_nodes_template.stat.exists + - name: Set empty enabled test types list for fstests tags: [ 'hosts' ] set_fact: diff --git a/playbooks/roles/gen_nodes/tasks/nfstest.yml b/playbooks/roles/gen_nodes/tasks/nfstest.yml new file mode 100644 index 000000000000..22ae4e87449c --- /dev/null +++ b/playbooks/roles/gen_nodes/tasks/nfstest.yml @@ -0,0 +1,28 @@ +--- +- name: Initialize the enabled nodes list for nfstest + ansible.builtin.set_fact: + nfstest_enabled_nodes: "{{ nfstest_enabled_test_groups | ansible.builtin.split }}" + +- name: Expand the nfstest node list to include -dev nodes + ansible.builtin.set_fact: + nfstest_enabled_nodes: "{{ nfstest_enabled_nodes + [item + '-dev'] }}" + with_items: "{{ nfstest_enabled_test_groups | ansible.builtin.split }}" + when: + - kdevops_baseline_and_dev|bool + +- name: Add the kdevops NFS server to the enabled nodes list + ansible.builtin.set_fact: + nfstest_enabled_nodes: "{{ nfstest_enabled_nodes + ['nfsd'] }}" + when: + - kdevops_nfsd_enable|bool + +- name: Generate the kdevops nodes file using {{ kdevops_nodes_template }} + vars: + node_template: "{{ kdevops_nodes_template | basename }}" + all_generic_nodes: "{{ generic_nodes }}" + nodes: "{{ [kdevops_host_prefix + '-'] | product(nfstest_enabled_nodes) | map('join') | list }}" + ansible.builtin.template: + src: "{{ node_template }}" + dest: "{{ topdir_path }}/{{ kdevops_nodes }}" + force: true + mode: "u=rw,g=r,o=r" -- 2.44.0