Merge branch 'develop' into develop

Author: lukeseawalker

CHANGELOG.md

@@ -18,6 +18,7 @@ CHANGELOG
 - Add support for multiple instance types in the same Compute Resource.
 - Add support for a Name field in PlacementGroup as the preferred naming method.
 - Add support for Networking.PlacementGroup in the SlurmQueues.ComputeResources section
+- Upgrade Slurm to version 22.05.3.
 
 **BUG FIXES**
 - Fix validation of parameter `SharedStorage/EfsSettings`: now validation fails when `FileSystemId` is specified

tests/integration-tests/tests/networking/test_cluster_networking.py

@@ -136,16 +136,7 @@ def test_cluster_in_no_internet_subnet(
     _check_hostname(remote_command_executor)
     _run_prolog_epilog_jobs(remote_command_executor, slurm_commands)
     _run_mpi_jobs(mpi_variants, remote_command_executor, test_datadir, slurm_commands, cluster, region)
-    expected_log_streams = {
-        "HeadNode": {"cfn-init", "cloud-init", "clustermgtd", "chef-client", "slurmctld", "supervisord"},
-        "Compute": {
-            "syslog" if os.startswith("ubuntu") else "system-messages",
-            "computemgtd",
-            "supervisord",
-            "slurm_prolog_epilog",
-        },
-    }
-    utils.check_pcluster_list_cluster_log_streams(cluster, os, expected_log_streams)
+    utils.check_pcluster_list_cluster_log_streams(cluster, os)
     assert_no_errors_in_logs(remote_command_executor, scheduler)
     logging.info("Checking compute node is scaled down after scaledown idle time")
     wait_for_num_instances_in_cluster(cluster.cfn_name, region, 1)

tests/integration-tests/tests/schedulers/test_slurm.py

@@ -1231,7 +1231,7 @@ def _gpu_resource_check(slurm_commands, partition, instance_type, instance_type_
 def _test_slurm_version(remote_command_executor):
     logging.info("Testing Slurm Version")
     version = remote_command_executor.run_remote_command("sinfo -V").stdout
-    assert_that(version).is_equal_to("slurm 21.08.8-2")
+    assert_that(version).is_equal_to("slurm 22.05.3")
 
 
 def _test_job_dependencies(slurm_commands, region, stack_name, scaledown_idletime):