From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E87451FECBA for ; Tue, 9 Sep 2025 00:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757379020; cv=none; b=lJUT3hBTicHe+ejtxDD7GKjmG6AE2tHVr/m1jyS40kbicFK+mu45HZVkNSETrjMC0wFB+rNKacNALp1nr9WHCMkfu0knlMlhXa6uqlA9oEf5dwJtNNJ00Yu5p9b79bR8UaFu/c5VbcB64OWBRSttcahjLVqdKXBI8InmAjvrNOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757379020; c=relaxed/simple; bh=Xc0X6d0Abrf4zf8JfBvNQwsYmVIEySy7Iot2LkfJpyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z/zgFtZPean76quvGfaGkaDYiHVtpJSoU1FGzhqRKu76zt7VGsE+NRSPtywYfSEZl4sXRfY6q14zX4s1tQRJ4Q459hHbPHU6P1mOAZ9XHIkkCkukpImXD0VWcvUWCdKLf2Nu8ruyn1NtKxYbr1NGZxlXi5uv9CbTkgwzTg6kuQ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=c3GaFdsT; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="c3GaFdsT" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=DFNn/aUL/Qq6Pl/QKGxfSPJ6CzOccUeT5W0aU0v2k9U=; b=c3GaFdsTBL8BCd4i0GTEzRKxqr 6ftiCEfUxfhOtnNiVd8vYmVw9HKlh37GB+kGW6fIWRtq9S+7TXl4hIE/99/kdiag0jqRf4GfBNc2k BOV83uFO8gLGr+9DFGdPJhA/N4bpIbRm6Rutv3X7ZIkaK5eWfZzKU4rDmohKFm7ckFrV+oAAOYy06 2gBPJustGei8qEQFg5ZPc0O7bfPfxrediRWY2hFoy98LI7JV+80K9J+Xjde+KeNH1hW9FhinoTk+q Xctw2voanGykY8T5e4u1Mdx0xDFUHlyrMPt2hb4TNeBDVcP+VydnbcOgNIDdAnSzVfybl0XVg94RS gOtWyT7A==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1uvmYs-00000003JvE-2UWH; Tue, 09 Sep 2025 00:50:18 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Luis Chamberlain , Daniel Gomez Subject: [PATCH 2/2] gen_hosts: remove 'write-your-own-template' placeholder text Date: Mon, 8 Sep 2025 17:50:16 -0700 Message-ID: <20250909005016.791529-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250909005016.791529-1-mcgrof@kernel.org> References: <20250909005016.791529-1-mcgrof@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 Sender: Luis Chamberlain During patch review, it was noted that the placeholder text 'write-your-own-template-for-...-workflow' was introduced in commit 71f085a4d77f ("kdevops: replace ansible hosts generation jinja2 templating") from kdevops-history and has been expanded to other templates. This placeholder text serves no functional purpose and should be replaced with proper template structure. The cxl.j2 and pynfs.j2 workflow templates contained these placeholders which have now been replaced with proper host definitions following the pattern used by other workflow templates. The templates now properly define: - The workflow host in [all] section - A [baseline] group with the workflow host - A workflow-specific group ([cxl] or [pynfs]) with the host - Proper ansible_python_interpreter variables for each group This cleanup ensures consistency across all workflow templates. Suggested-by: Daniel Gomez Fixes: 40df5ef72d197 ("gen_hosts: use kdevops_workflow_name directly for template selection") Signed-off-by: Luis Chamberlain --- .../roles/gen_hosts/templates/workflows/cxl.j2 | 14 +++++++++++++- .../roles/gen_hosts/templates/workflows/pynfs.j2 | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/gen_hosts/templates/workflows/cxl.j2 b/playbooks/roles/gen_hosts/templates/workflows/cxl.j2 index 53790f29..cf1e7083 100644 --- a/playbooks/roles/gen_hosts/templates/workflows/cxl.j2 +++ b/playbooks/roles/gen_hosts/templates/workflows/cxl.j2 @@ -1,7 +1,19 @@ {# Workflow template for CXL #} [all] localhost ansible_connection=local -write-your-own-template-for-cxl-workflow +{{ kdevops_host_prefix }}-cxl [all:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[baseline] +{{ kdevops_host_prefix }}-cxl + +[baseline:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[cxl] +{{ kdevops_host_prefix }}-cxl + +[cxl:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2 b/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2 index 6145b1a0..a93b8f06 100644 --- a/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2 +++ b/playbooks/roles/gen_hosts/templates/workflows/pynfs.j2 @@ -1,7 +1,19 @@ {# Workflow template for pynfs #} [all] localhost ansible_connection=local -write-your-own-template-for-pynfs-workflow +{{ kdevops_host_prefix }}-pynfs [all:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[baseline] +{{ kdevops_host_prefix }}-pynfs + +[baseline:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[pynfs] +{{ kdevops_host_prefix }}-pynfs + +[pynfs:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -- 2.50.1