From patchwork Tue Dec 10 19:29:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13901960 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 298C423ED63 for ; Tue, 10 Dec 2024 19:29:24 +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=1733858965; cv=none; b=W2xASfx4My9vWupf90LaXEkJ2zUVK0K3bjpcvlxVbPn2m8+PJaT1D9qrxOMB72IWozwsfLbUJNjjhiCIATh6LT23EZXhr0TY2lybVwW1Cboob8ftndST7pEf8txcvEESpYZOhQlct3NIiuy1sX2C8xuGzoQAXEK4OUw0d7MlvZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733858965; c=relaxed/simple; bh=w4WDkVbXrjZ6HBjIKrCCLb7yOhrkqbnFhT4qRPpjrUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ieK55r9E8I/daWKbdAHD9Y1faZ53cAGJY4fACZj0mZN+EoYRUhwPAYCgX0PvyfssZ1cWNTnUlfgBcAjsmpOMIsPYXnkDJ/3mIsI/tels+kVFXkXXhLPlt7rJPb7u0J+O2FvSTH6olzkP9fYaVsF46TfmxVnRctqIdIJu7W/sE60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uHDtknPD; 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="uHDtknPD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59A80C4CEE4; Tue, 10 Dec 2024 19:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733858964; bh=w4WDkVbXrjZ6HBjIKrCCLb7yOhrkqbnFhT4qRPpjrUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uHDtknPDRsPc9DjVfrY0AShQAuBmUsLMQDSp4Sd2FLOx5cRj7zjDAt3KrkNdOApv5 eNybQUsQ9lLoKq1n7WmqHaKEtneGX8y0D1ii0S/dnN1oTqUNjgYeYrm/RqiO9mf+ie xNsAE/zLzvKjP0puiz8dvv3hqK+JAjG31yCJB7EaE5d4x3wH0ju+xsfMI/sh6KHDQx GvSC3xr4ft3bK2vV0L2hZQuidGe0gHiVXe5lIa4uVCFbla8WcwXGVpxBw+5BFkGOik HWITXSRRGRqvidwL2Z5CO8KpiNg9u0rM/1Pn5cx7e5Xun49k/6aqokhl58UO11E2hj gDGdMX3uiF1RA== From: cel@kernel.org To: Cc: Anna Schumaker , Chuck Lever Subject: [PATCH 2/6] gen_nodes: Fix generation of the list of test nodes Date: Tue, 10 Dec 2024 14:29:15 -0500 Message-ID: <20241210192920.682914-3-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241210192920.682914-1-cel@kernel.org> References: <20241210192920.682914-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever 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 --- 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 }}"