From a1fe218fa282cf59eed14d113088c0151c4300ea Mon Sep 17 00:00:00 2001
From: chenwany <chenwany@amazon.com>
Date: Wed, 13 Dec 2023 15:47:04 -0800
Subject: [PATCH] Slurm upgrade to 23.02.7

Upgrade Slurm from version 23.02.6 to version 23.02.7

Signed-off-by: chenwany <chenwany@amazon.com>
---
 CHANGELOG.md                                                | 1 +
 .../attributes/slurm_attributes.rb                          | 5 -----
 cookbooks/aws-parallelcluster-slurm/attributes/versions.rb  | 6 +++++-
 .../recipes/install/install_slurm.rb                        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fc0d96cb..9d2f161c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Allow for mounting `home` as an EFS or FSx external shared storage via the `SharedStorage` section of the config file.
 
 **CHANGES**
+- Upgrade Slurm to 23.02.7 (from 23.02.6).
 - Do not wait for static nodes in maintenance to signal CFN that the head node initialization is complete.
 - Upgrade `aws-cfn-bootstrap` to version 2.0-28.
 - Upgrade Python to 3.9.17.
diff --git a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
index 1aee1d190..9628dfab0 100644
--- a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
+++ b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
@@ -1,11 +1,6 @@
 # URLs to software packages used during install recipes
 default['cluster']['slurm']['fleet_config_path'] = "#{node['cluster']['slurm_plugin_dir']}/fleet-config.json"
 
-# Slurm attributes shared between install_slurm and configure_slurm_accounting
-default['cluster']['slurm']['commit'] = ''
-default['cluster']['slurm']['branch'] = ''
-default['cluster']['slurm']['sha256'] = 'ed44d4e591c0f91874d535cb8c9ea67dd2a38bfa4e96fa6c71687293f6a1d3bb'
-
 default['cluster']['dns_domain'] = nil
 default['cluster']['use_private_hostname'] = 'false'
 
diff --git a/cookbooks/aws-parallelcluster-slurm/attributes/versions.rb b/cookbooks/aws-parallelcluster-slurm/attributes/versions.rb
index ebc86598a..ed4217c48 100644
--- a/cookbooks/aws-parallelcluster-slurm/attributes/versions.rb
+++ b/cookbooks/aws-parallelcluster-slurm/attributes/versions.rb
@@ -1,4 +1,8 @@
 # Slurm
-default['cluster']['slurm']['version'] = '23-02-6-1'
+default['cluster']['slurm']['version'] = '23-02-7-1'
+default['cluster']['slurm']['commit'] = ''
+default['cluster']['slurm']['branch'] = ''
+default['cluster']['slurm']['sha256'] = '3f60ad5b5a492312d1febb9f9167caa3aee7f8438bb032590a993f5a65c5e4db'
+default['cluster']['slurm']['base_url'] = "https://github.com/SchedMD/slurm/archive"
 # Munge
 default['cluster']['munge']['munge_version'] = '0.5.15'
diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_slurm.rb b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_slurm.rb
index fef6fc138..656c5b33a 100644
--- a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_slurm.rb
+++ b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_slurm.rb
@@ -30,7 +30,7 @@
                    "slurm-#{slurm_version}"
                  end
 slurm_tarball = "#{node['cluster']['sources_dir']}/#{slurm_tar_name}.tar.gz"
-slurm_url = "https://github.com/SchedMD/slurm/archive/#{slurm_tar_name}.tar.gz"
+slurm_url = "#{node['cluster']['slurm']['base_url']}/#{slurm_tar_name}.tar.gz"
 slurm_sha256 = if slurm_branch.empty?
                  node['cluster']['slurm']['sha256']
                end