From f3a7487d735e625233c2e44628489e4167e04e30 Mon Sep 17 00:00:00 2001
From: Javy de Koning <javy@amazon.nl>
Date: Fri, 5 Dec 2025 10:20:03 +0100
Subject: [PATCH] feat: bump slurm versions and link to docs. Fixes: #60

---
 recipes/pcs/getting_started/assets/cluster.yaml        |  2 +-
 .../assets/components/install-pcs-slurm.yaml           |  2 +-
 recipes/pcs/login_node_for_res/README.md               |  4 ++--
 .../assets/imagebuilder-components.yml                 | 10 ++++------
 recipes/pcs/try_amd/assets/cluster.cfn.yaml            |  2 +-
 recipes/pcs/try_graviton/assets/cluster.cfn.yaml       |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/recipes/pcs/getting_started/assets/cluster.yaml b/recipes/pcs/getting_started/assets/cluster.yaml
index daaad61d..ef090db8 100644
--- a/recipes/pcs/getting_started/assets/cluster.yaml
+++ b/recipes/pcs/getting_started/assets/cluster.yaml
@@ -42,7 +42,7 @@ Parameters:
   SlurmVersion:
     Type: String
     Default: 25.05
-    Description: Version of Slurm to use
+    Description: 'Slurm version (e.g. 25.05). See supported versions: https://docs.aws.amazon.com/pcs/latest/userguide/slurm-versions.html'
     AllowedValues:
          - 24.05
          - 24.11
diff --git a/recipes/pcs/hpc_ready_ami/assets/components/install-pcs-slurm.yaml b/recipes/pcs/hpc_ready_ami/assets/components/install-pcs-slurm.yaml
index d98eb1d7..ff1c8381 100644
--- a/recipes/pcs/hpc_ready_ami/assets/components/install-pcs-slurm.yaml
+++ b/recipes/pcs/hpc_ready_ami/assets/components/install-pcs-slurm.yaml
@@ -20,7 +20,7 @@ Parameters:
   SlurmVersion:
     Type: String
     Default: '25.05'
-    Description: Major version of Slurm to install
+    Description: 'Slurm version (e.g. 25.05). See supported versions: https://docs.aws.amazon.com/pcs/latest/userguide/slurm-versions.html'
     AllowedValues:
          - '24.05'
          - '24.11'
diff --git a/recipes/pcs/login_node_for_res/README.md b/recipes/pcs/login_node_for_res/README.md
index 6fdfa0aa..c9303c1a 100644
--- a/recipes/pcs/login_node_for_res/README.md
+++ b/recipes/pcs/login_node_for_res/README.md
@@ -47,12 +47,12 @@ The next step is to create the Image Builder **recipe** and **pipeline**. This w
    2. `PcsAgentInstaller` (Owned by me) - This component handles installation of the AWS PCS Agent
       1. **PcsAgentInstallerVersion**: latest
    3. `PcsSlurmInstaller` (Owned by me) - This component handles installation of the AWS PCS Slurm
-      1. **PcsSlurmVersion**: <Slurm version - e.g. 24.11>
+      1. **PcsSlurmVersion**: <Slurm version - e.g. 25.05>
       2. **PcsSlurmInstallerVersion**: latest
    4. `res-pcs-login-node-post-install` (Owned by me) - This component installs the services to connect to the PCS cluster
       1. **Region:** <AWS Region for deployment - e.g. us-east-1>
       2. **ClusterId:** <PCS cluster id - e.g. pcs_axhof4inf9>
-      3. **SlurmVersion:** <Slurm version - e.g. 24.11>
+      3. **SlurmVersion:** <Slurm version - e.g. 25.05>
    5. `RESVDILinuxInstaller` (Owned by me) - This component performs RES bootstrapping
       1. **AWSAccountID:** <AWS Account ID where RES is installed>
       2. **RESEnvName:** <RES environment name - e.g. res-demo>
diff --git a/recipes/pcs/login_node_for_res/assets/imagebuilder-components.yml b/recipes/pcs/login_node_for_res/assets/imagebuilder-components.yml
index a88fcb1a..ebc44882 100644
--- a/recipes/pcs/login_node_for_res/assets/imagebuilder-components.yml
+++ b/recipes/pcs/login_node_for_res/assets/imagebuilder-components.yml
@@ -18,11 +18,9 @@ Metadata:
 Parameters:
   SlurmVersion:
     Type: String
-    Default: '24.11'
-    Description: Slurm version (e.g. 24.05)
-    AllowedValues:
-         - '24.05'
-         - '24.11'
+    Default: '25.05'
+    Description: 'Slurm version (e.g. 25.05). See supported versions: https://docs.aws.amazon.com/pcs/latest/userguide/slurm-versions.html'
+    AllowedPattern: '^\d{2}\.\d{2}$'
   HpcRecipesS3Bucket:
     Type: String
     Default: aws-hpc-recipes
@@ -90,7 +88,7 @@ Resources:
               description: PCS Cluster id (e.g. pcs-abc1234)
           - SlurmVersion:
               type: string
-              description: Slurm version (e.g. 24.11)
+              description: Slurm version (e.g. 25.05)
               default: "${SlurmVersion}"
         phases:
           - name: build
diff --git a/recipes/pcs/try_amd/assets/cluster.cfn.yaml b/recipes/pcs/try_amd/assets/cluster.cfn.yaml
index 32470d06..25223fee 100644
--- a/recipes/pcs/try_amd/assets/cluster.cfn.yaml
+++ b/recipes/pcs/try_amd/assets/cluster.cfn.yaml
@@ -31,7 +31,7 @@ Parameters:
   SlurmVersion:
     Type: String
     Default: 25.05
-    Description: Version of Slurm to use
+    Description: 'Slurm version (e.g. 25.05). See supported versions: https://docs.aws.amazon.com/pcs/latest/userguide/slurm-versions.html'
     AllowedValues:
          - 24.05
          - 24.11
diff --git a/recipes/pcs/try_graviton/assets/cluster.cfn.yaml b/recipes/pcs/try_graviton/assets/cluster.cfn.yaml
index 556464ab..26805348 100644
--- a/recipes/pcs/try_graviton/assets/cluster.cfn.yaml
+++ b/recipes/pcs/try_graviton/assets/cluster.cfn.yaml
@@ -32,7 +32,7 @@ Parameters:
   SlurmVersion:
     Type: String
     Default: 25.05
-    Description: Version of Slurm to use
+    Description: 'Slurm version (e.g. 25.05). See supported versions: https://docs.aws.amazon.com/pcs/latest/userguide/slurm-versions.html'
     AllowedValues:
          - 24.05
          - 24.11