[Test] Fix spec tests failures for Ubuntu24.04 and Amazon Linux 2023.

Author: gmarciani

cookbooks/aws-parallelcluster-environment/spec/unit/resources/efa_spec.rb

@@ -55,8 +55,10 @@ def self.configure(chef_run)
       cached(:prerequisites) do
         if %(redhat rocky).include?(platform)
           %w(environment-modules libibverbs-utils librdmacm-utils rdma-core-devel)
-        elsif platform == 'amazon'
+        elsif platform == 'amazon' and version == '2'
           %w(environment-modules libibverbs-utils librdmacm-utils)
+        elsif platform == 'amazon' and version == '2023'
+          %w(environment-modules libibverbs-utils librdmacm-utils rdma-core-devel)
         else
           "environment-modules"
         end

cookbooks/aws-parallelcluster-environment/spec/unit/resources/network_service_spec.rb

@@ -26,20 +26,29 @@ def self.reload(chef_run)
         ConvergeNetworkService.restart(runner)
       end
       cached(:node) { chef_run.node }
-      cached(:network_service_name) do
-        {
-          'amazon' => 'network',
-          'centos' => 'network',
-          'redhat' => 'NetworkManager',
-          'rocky' => 'NetworkManager',
-          'ubuntu' => 'systemd-resolved',
-        }[platform]
-      end
+      cached(:network_service_name) {
+        if platform == 'amazon' and version == '2' or platform == 'centos'
+          'network'
+        elsif platform == 'amazon' and version == '2023'
+          'systemd-networkd'
+        elsif platform == 'ubuntu'
+          'systemd-resolved'
+        elsif %(redhat rocky).include?(platform)
+          'NetworkManager'
+        else
+          raise "Cannot determine network_service_name: unrecognized platform #{platform}"
+        end
+      }
 
       it "restarts network service" do
         is_expected.to restart_network_service('restart')
+        network_services_to_restart = if platform == 'amazon' and version == '2023'
+                                        [network_service_name, 'systemd-resolved']
+                                      else
+                                        [network_service_name]
+                                      end
 
-        is_expected.to write_log("Restarting '#{network_service_name}' service, platform #{platform} '#{node['platform_version']}'")
+        is_expected.to write_log("Restarting '#{network_services_to_restart.join(' ')}' service, platform #{platform} '#{node['platform_version']}'")
 
         is_expected.to restart_service(network_service_name)
           .with(ignore_failure: true)
@@ -55,15 +64,19 @@ def self.reload(chef_run)
         runner = runner(platform: platform, version: version, step_into: ['network_service'])
         ConvergeNetworkService.reload(runner)
       end
-      cached(:network_service_name) do
-        {
-          'amazon' => 'network',
-          'centos' => 'network',
-          'redhat' => 'NetworkManager',
-          'rocky' => 'NetworkManager',
-          'ubuntu' => 'systemd-resolved',
-        }[platform]
-      end
+      cached(:network_service_name) {
+        if platform == 'amazon' and version == '2' or platform == 'centos'
+          'network'
+        elsif platform == 'amazon' and version == '2023'
+          'systemd-networkd'
+        elsif platform == 'ubuntu'
+          'systemd-resolved'
+        elsif %(redhat rocky).include?(platform)
+          'NetworkManager'
+        else
+          raise "Cannot determine network_service_name: unrecognized platform #{platform}"
+        end
+      }
 
       it 'reloads network_service' do
         is_expected.to reload_network_service('reload')

cookbooks/aws-parallelcluster-environment/spec/unit/resources/raid_mount_unmount_spec.rb

@@ -11,7 +11,7 @@ def wait_for_block_dev(_path)
     context "on #{platform}#{version}" do
       cached(:venv_path) { 'venv' }
       cached(:raid_superblock_version) do
-        %(redhat rocky).include?(platform) || "#{platform}#{version}" == 'ubuntu20.04' || "#{platform}#{version}" == 'ubuntu22.04' ? '1.2' : '0.90'
+        %(redhat rocky ubuntu).include?(platform) || "#{platform}#{version}" == 'amazon2023' ? '1.2' : '0.90'
       end
       cached(:chef_run) do
         runner = runner(