public inbox for kdevops@lists.linux.dev
 help / color / mirror / Atom feed
From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Anna Schumaker <anna@kernel.org>, Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH 2/6] gen_nodes: Fix generation of the list of test nodes
Date: Tue, 10 Dec 2024 14:29:15 -0500	[thread overview]
Message-ID: <20241210192920.682914-3-cel@kernel.org> (raw)
In-Reply-To: <20241210192920.682914-1-cel@kernel.org>

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

Terraform was getting an incorrect list of instances to create. The
new workflows I added got the node list generation wrong.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/gen_nodes/tasks/gitr.yml    | 4 ++--
 playbooks/roles/gen_nodes/tasks/ltp.yml     | 4 ++--
 playbooks/roles/gen_nodes/tasks/nfstest.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/roles/gen_nodes/tasks/gitr.yml b/playbooks/roles/gen_nodes/tasks/gitr.yml
index 717a6377d431..4083336f687b 100644
--- a/playbooks/roles/gen_nodes/tasks/gitr.yml
+++ b/playbooks/roles/gen_nodes/tasks/gitr.yml
@@ -25,8 +25,8 @@
 - 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(gitr_enabled_nodes) | map('join') | list }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(gitr_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"
diff --git a/playbooks/roles/gen_nodes/tasks/ltp.yml b/playbooks/roles/gen_nodes/tasks/ltp.yml
index 711f843838f6..118a2d82626d 100644
--- a/playbooks/roles/gen_nodes/tasks/ltp.yml
+++ b/playbooks/roles/gen_nodes/tasks/ltp.yml
@@ -13,8 +13,8 @@
 - 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(ltp_enabled_nodes) | map('join') | list }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(ltp_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"
diff --git a/playbooks/roles/gen_nodes/tasks/nfstest.yml b/playbooks/roles/gen_nodes/tasks/nfstest.yml
index 13bc96b06d6b..6c6c99eec43e 100644
--- a/playbooks/roles/gen_nodes/tasks/nfstest.yml
+++ b/playbooks/roles/gen_nodes/tasks/nfstest.yml
@@ -25,8 +25,8 @@
 - 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 }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(nfstest_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"
-- 
2.47.0


  parent reply	other threads:[~2024-12-10 19:29 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-10 19:29 [PATCH 0/6] Recent fixes cel
2024-12-10 19:29 ` [PATCH 1/6] fstests: Fix NFS mount options for fstests cel
2024-12-10 19:29 ` cel [this message]
2024-12-10 19:29 ` [PATCH 3/6] fstests: Fix selection of NFSD export type for the pNFS test section cel
2024-12-10 19:29 ` [PATCH 4/6] NFSD: Implement NVMe storage for NFSD exports cel
2024-12-11  3:42   ` Luis Chamberlain
2024-12-11 13:50     ` Chuck Lever
2024-12-12  2:28       ` Luis Chamberlain
2024-12-10 19:29 ` [PATCH 5/6] playbooks: Add a Code Ready Builder role cel
2024-12-10 19:29 ` [PATCH 6/6] codereadyrepo: Enable codeready-builder in AWS cel
2024-12-11  3:44 ` [PATCH 0/6] Recent fixes Luis Chamberlain

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=20241210192920.682914-3-cel@kernel.org \
    --to=cel@kernel.org \
    --cc=anna@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox