Merge branch 'develop' into wip/3.14.0-changelog

Author: hehe7318

cookbooks/aws-parallelcluster-platform/libraries/nvidia.rb

@@ -30,9 +30,8 @@ def get_device_ids
   #  A100 (P4), H100(P5), B200(P6) and GB200()p6e) systems have NVSwitches
   # NVSwitch device id is 10de:1af1 for P4 instance
   # NVSwitch device id is 10de:22a3 for P5 instance
-  # NVSwitch device id is 10de:2901 for P6 instance
   # NVSwitch device id is 10de:2941 for P6e instance
-  { 'a100' => '10de:1af1', 'h100' => '10de:22a3', 'b200' => '10de:2901', 'gb200' => '10de:2941' }
+  { 'a100' => '10de:1af1', 'h100' => '10de:22a3', 'gb200' => '10de:2941' }
 end
 
 def is_gb200_node?

cookbooks/aws-parallelcluster-slurm/test/controls/slurm_config_spec.rb

@@ -46,7 +46,7 @@
   end
 
   describe 'check cgroup memory resource controller is enabled' do
-    subject { bash("grep memory /proc/cgroups | awk '{print $4}'") }
+    subject { bash("sleep 5 && grep memory /proc/cgroups | awk '{print $4}'") }
     its('exit_status') { should eq 0 }
     its('stdout.strip') { should cmp 1 }
   end