From 7c0d458637f62b2b4a50dd2dd946be261e01b3dc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 3 Mar 2026 17:32:59 +0000 Subject: [PATCH] ci: normalize warewulf provisioner for OpenHPC 4 In OpenHPC 2/3, Provisioner=warewulf means Warewulf v3 and Provisioner=warewulf4 means Warewulf v4. In OpenHPC 4, warewulf v3 is gone and Provisioner=warewulf means Warewulf v4. Normalize Provisioner to "warewulf4" when VERSION_MAJOR is 4 so that all existing warewulf4 conditionals in support_functions.sh are triggered correctly. The normalization is placed after the recipeFile path assignment to preserve the correct on-disk path (warewulf/, not warewulf4/). Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- ansible/roles/test/files/install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible/roles/test/files/install.sh b/ansible/roles/test/files/install.sh index 3b95b35..e77e8f9 100755 --- a/ansible/roles/test/files/install.sh +++ b/ansible/roles/test/files/install.sh @@ -171,6 +171,13 @@ inputTemplate=/opt/ohpc/pub/doc/recipes/${os_major}/input.local inputFile=/root/ci_ohpc_inputs status=0 +# For OpenHPC 4, "warewulf" is Warewulf v4 (not v3 as in OHPC 2/3). +# Normalize Provisioner to "warewulf4" so that all existing conditionals +# comparing against "warewulf4" are triggered correctly. +if [[ "${VERSION_MAJOR}" == "4" ]] && [[ "${Provisioner}" == "warewulf" ]]; then + Provisioner="warewulf4" +fi + enable_repo install_doc_rpm