Update rubocop requirement from ~> 1.15.0 to ~> 1.25.0

CHANGELOG.md

@@ -18,6 +18,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Reduce timeout from 50 to a maximum of 5min in case of DynamoDB connection issues at compute node bootstrap.
 - Change the logic to number the routing tables when an instance have multiple NICs.
 - Upgrade Python from 3.7.13 to 3.9.13.
+- Upgrade Slurm to version 22.05.3.
 
 3.2.0
 ------

Gemfile

@@ -7,7 +7,7 @@ gem 'berkshelf'
 group :style do
   gem 'cookstyle', '~> 7.25.9'
   gem 'rake', '~> 13.0.1'
-  gem 'rubocop', '~> 1.22.3'
+  gem 'rubocop', '~> 1.23.0'
   gem 'rubocop-gitlab-security', '~> 0.1.1'
 end
 

attributes/default.rb

@@ -124,9 +124,9 @@
 # URLs to software packages used during install recipes
 # Slurm software
 default['cluster']['slurm_plugin_dir'] = '/etc/parallelcluster/slurm_plugin'
-default['cluster']['slurm']['version'] = '21-08-8-2'
+default['cluster']['slurm']['version'] = '22-05-3-1'
 default['cluster']['slurm']['url'] = "https://github.com/SchedMD/slurm/archive/slurm-#{node['cluster']['slurm']['version']}.tar.gz"
-default['cluster']['slurm']['sha1'] = 'f7687c11f024fbbe5399b93906d1179adc5c3fb6'
+default['cluster']['slurm']['sha1'] = 'f7340a7def5ba359327dd8ff41272b76e28d8bdf'
 default['cluster']['slurm']['user'] = 'slurm'
 default['cluster']['slurm']['user_id'] = node['cluster']['reserved_base_uid'] + 1
 default['cluster']['slurm']['group'] = node['cluster']['slurm']['user']
@@ -552,7 +552,6 @@
 default['cluster']['raid_vol_ids'] = ''
 default['cluster']['dns_domain'] = nil
 default['cluster']['use_private_hostname'] = 'false'
-default['cluster']['add_node_hostnames_in_hosts_file'] = node['cluster']['use_private_hostname']
 default['cluster']['skip_install_recipes'] = 'yes'
 default['cluster']['enable_nss_slurm'] = node['cluster']['directory_service']['enabled']
 default['cluster']['realmemory_to_ec2memory_ratio'] = 0.95

cookbooks/aws-parallelcluster-config/files/default/cloudwatch_agent/cloudwatch_log_files.json

@@ -540,28 +540,6 @@
       ],
       "feature_conditions": []
     },
-    {
-      "timestamp_format_key": "default",
-      "file_path": "/var/log/parallelcluster/slurm_prolog_epilog.log",
-      "log_stream_name": "slurm_prolog_epilog",
-      "schedulers": [
-        "slurm"
-      ],
-      "platforms": [
-        "centos",
-        "ubuntu",
-        "amazon"
-      ],
-      "node_roles": [
-        "ComputeFleet"
-      ],
-      "feature_conditions": [
-        {
-          "dna_key": "use_private_hostname",
-          "satisfying_values": ["true"]
-        }
-      ]
-    },
     {
       "timestamp_format_key": "default",
       "file_path": "/var/log/parallelcluster/clusterstatusmgtd",

cookbooks/aws-parallelcluster-slurm/recipes/config_head_node.rb

@@ -192,34 +192,6 @@
   action :create
 end
 
-if node['cluster']['add_node_hostnames_in_hosts_file'] == "true"
-  directory "#{node['cluster']['slurm']['install_dir']}/etc/pcluster/prolog.d" do
-    user 'root'
-    group 'root'
-    mode '0755'
-  end
-
-  cookbook_file "#{node['cluster']['slurm']['install_dir']}/etc/pcluster/prolog.d/01-pcluster-prolog" do
-    source 'head_node_slurm/prolog'
-    owner node['cluster']['slurm']['user']
-    group node['cluster']['slurm']['group']
-    mode '0744'
-  end
-
-  directory "#{node['cluster']['slurm']['install_dir']}/etc/pcluster/epilog.d" do
-    user 'root'
-    group 'root'
-    mode '0755'
-  end
-
-  cookbook_file "#{node['cluster']['slurm']['install_dir']}/etc/pcluster/epilog.d/01-pcluster-epilog" do
-    source 'head_node_slurm/epilog'
-    owner node['cluster']['slurm']['user']
-    group node['cluster']['slurm']['group']
-    mode '0744'
-  end
-end
-
 service "slurmctld" do
   supports restart: false
   action %i(enable start)

cookbooks/aws-parallelcluster-slurm/templates/default/slurm/cgroup.conf.erb

@@ -2,7 +2,6 @@
 # Slurm cgroup support configuration file
 ###
 CgroupAutomount=yes
-TaskAffinity=no
 ConstrainCores=yes
 #
 # WARNING!!! The slurm_parallelcluster_cgroup.conf file included below can be updated by the pcluster process.

cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb

@@ -40,19 +40,6 @@ SuspendTimeout=120
 PrivateData=cloud
 ResumeRate=0
 SuspendRate=0
-<% if node["cluster"]["add_node_hostnames_in_hosts_file"] == 'true' -%>
-#
-# PROLOG AND EPILOG
-# prolog is executed to add nodes info to /etc/hosts on compute nodes when each job is allocated
-# epilog is executed to clean contents written by prolog
-# PrologFlags specifies the prolog is executed at job allocation and prologs and epilogs are of different jobs are executed serially
-# SchedulerParameters allows jobs to be requeued to other nodes if prolog error exits.
-# Note the error exit of prolog drains a node, because the error of prolog is considered as a node error.
-Epilog=<%= node['cluster']['slurm']['install_dir'] %>/etc/pcluster/epilog.d/*
-Prolog=<%= node['cluster']['slurm']['install_dir'] %>/etc/pcluster/prolog.d/*
-PrologFlags=alloc,serial
-SchedulerParameters=nohold_on_prolog_fail
-<% end -%>
 #
 # TIMERS
 SlurmctldTimeout=300