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

Author: gmarciani

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

@@ -53,9 +53,9 @@ def self.configure(chef_run)
   for_all_oses do |platform, version|
     context "on #{platform}#{version}" do
       cached(:prerequisites) do
-        if %(redhat rocky).include?(platform)
+        if %(redhat rocky).include?(platform) || platform == 'amazon' && version == '2023'
           %w(environment-modules libibverbs-utils librdmacm-utils rdma-core-devel)
-        elsif platform == 'amazon'
+        elsif platform == 'amazon' && version == '2'
           %w(environment-modules libibverbs-utils librdmacm-utils)
         else
           "environment-modules"

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

@@ -27,19 +27,28 @@ def self.reload(chef_run)
       end
       cached(:node) { chef_run.node }
       cached(:network_service_name) do
-        {
-          'amazon' => 'network',
-          'centos' => 'network',
-          'redhat' => 'NetworkManager',
-          'rocky' => 'NetworkManager',
-          'ubuntu' => 'systemd-resolved',
-        }[platform]
+        if platform == 'amazon' && version == '2' || platform == 'centos'
+          'network'
+        elsif platform == 'amazon' && 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
       end
 
       it "restarts network service" do
         is_expected.to restart_network_service('restart')
+        network_services_to_restart = if platform == 'amazon' && 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)
@@ -56,13 +65,17 @@ def self.reload(chef_run)
         ConvergeNetworkService.reload(runner)
       end
       cached(:network_service_name) do
-        {
-          'amazon' => 'network',
-          'centos' => 'network',
-          'redhat' => 'NetworkManager',
-          'rocky' => 'NetworkManager',
-          'ubuntu' => 'systemd-resolved',
-        }[platform]
+        if platform == 'amazon' && version == '2' || platform == 'centos'
+          'network'
+        elsif platform == 'amazon' && 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
       end
 
       it 'reloads network_service' do

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(

cookbooks/aws-parallelcluster-platform/spec/unit/resources/arm_pl_spec.rb

@@ -26,14 +26,19 @@ def self.setup(chef_run)
         when 'ubuntu'
           "Ubuntu-#{version}"
         when 'amazon'
-          "AmazonLinux-2"
+          if version == '2'
+            "AmazonLinux-2"
+          elsif version == '2023'
+            'RHEL-9'
+          end
         else
           "RHEL-#{version}"
         end
       end
 
       cached(:gcc_major_minor_version) do
-        if platform == 'ubuntu' && version == '22.04' || version == '9'
+        case "#{platform}#{version}"
+        when 'amazon2023', 'ubuntu24.04', 'ubuntu22.04', 'redhat9', 'rocky9'
           '11.3'
         else
           '9.3'

cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb

@@ -42,7 +42,8 @@ def self.nothing(chef_run)
           allow_any_instance_of(Object).to receive(:arm_instance?).and_return(true)
         end
 
-        if platform == 'ubuntu' && version.to_i == 20
+        case "#{platform}#{version}"
+        when "amazon2023", "ubuntu20.04"
           it "is false" do
             expect(resource.dcv_supported?).to eq(false)
           end
@@ -58,9 +59,10 @@ def self.nothing(chef_run)
       end
 
       context 'when not on arm' do
-        it "is true" do
+        is_supported = !("#{platform}#{version}" == 'amazon2023')
+        it "is #{is_supported}" do
           allow_any_instance_of(Object).to receive(:arm_instance?).and_return(false)
-          expect(resource.dcv_supported?).to eq(true)
+          expect(resource.dcv_supported?).to eq(is_supported)
         end
       end
     end
@@ -142,8 +144,8 @@ def self.nothing(chef_run)
           expect(resource.xdcv).to eq("nice-xdcv_#{xdcv_version}_#{dcv_pkg_arch}.#{base_os}.deb")
           expect(resource.dcv_web_viewer).to eq("nice-dcv-web-viewer_#{dcv_webviewer_version}_#{dcv_pkg_arch}.#{base_os}.deb")
           expect(resource.dcv_gl).to eq("/nice-dcv-gl_#{dcv_gl_version}_#{dcv_pkg_arch}.#{base_os}.deb")
-        else
-          dcv_platform_version = platform == "amazon" ? "7" : version.to_i
+        elsif "#{platform}#{version}" != 'amazon2023'
+          dcv_platform_version = "#{platform}#{version}" == "amazon2" ? "7" : version.to_i
           dcv_platform_version_pkg = platform == "amazon" ? "amzn2" : "el" + version
           expect(resource.dcv_package).to eq("nice-dcv-#{dcv_version}-#{dcv_platform_version_pkg}-#{dcv_url_arch}")
           expect(resource.dcv_server).to eq("nice-dcv-server-#{dcv_server_version}.el#{dcv_platform_version}.#{dcv_url_arch}.rpm")
@@ -479,14 +481,16 @@ def self.nothing(chef_run)
                                                       .with_code(/apt -y purge ifupdown/)
                                                       .with_code(%r{wget https://d1uj6qtbmh3dt5.cloudfront.net/NICE-GPG-KEY})
           when 'amazon'
-            is_expected.to install_package(alinux_prereq_packages).with_retries(10).with_retry_delay(5)
-            is_expected.to create_file('Setup Gnome standard').with(
-              content: "PREFERRED=/usr/bin/gnome-session",
-              owner: "root",
-              group: "root",
-              mode: "0755",
-              path: "/etc/sysconfig/desktop"
-            )
+            if version == '2'
+              is_expected.to install_package(alinux_prereq_packages).with_retries(10).with_retry_delay(5)
+              is_expected.to create_file('Setup Gnome standard').with(
+                content: "PREFERRED=/usr/bin/gnome-session",
+                owner: "root",
+                group: "root",
+                mode: "0755",
+                path: "/etc/sysconfig/desktop"
+              )
+            end
           else
             is_expected.to run_execute('Install gnome desktop').with_command('yum -y install @gnome').with_retries(3).with_retry_delay(5)
             is_expected.to install_package('xorg-x11-server-Xorg').with_retries(3).with_retry_delay(5)

cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb

@@ -201,6 +201,12 @@ def self.configure(chef_run)
         case platform
         when 'ubuntu'
           %w(build-essential devscripts debhelper check libsubunit-dev fakeroot pkg-config dkms)
+        when 'amazon'
+          if version == '2023'
+            %w(dkms rpm-build make check check-devel)
+          else
+            %w(dkms rpm-build make check check-devel subunit subunit-devel)
+          end
         else
           %w(dkms rpm-build make check check-devel subunit subunit-devel)
         end
@@ -209,13 +215,15 @@ def self.configure(chef_run)
       cached(:gdrcopy_platform) do
         platforms = {
           'amazon2' => 'amzn-2',
+          'amazon2023' => 'amzn-2023',
           'centos7' => 'el7',
           'rhel8' => 'el8',
           'rocky8' => 'el8',
           'rhel9' => 'el9',
           'rocky9' => 'el9',
           'ubuntu20.04' => 'Ubuntu20_04',
           'ubuntu22.04' => 'Ubuntu22_04',
+          'ubuntu24.04' => 'Ubuntu24_04',
         }
         platforms["#{platform}#{version}"]
       end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/install_packages_spec.rb

@@ -59,7 +59,7 @@ def self.setup(chef_run)
           end
         end
 
-        if platform == 'amazon'
+        if platform == 'amazon' && version == '2'
           it 'installs extra packages' do
             is_expected.to install_alinux_extras_topic('R3.4')
           end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/modules_spec.rb

@@ -38,6 +38,8 @@
           "/usr/share/modules/init/.modulespath"
         when 'redhat', 'rocky'
           '/etc/environment-modules/modulespath'
+        when 'amazon'
+          version == '2' ? '/usr/share/Modules/init/.modulespath' : '/etc/environment-modules/modulespath'
         else
           "/usr/share/Modules/init/.modulespath"
         end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_dcgm_spec.rb

@@ -89,7 +89,7 @@ def self.setup(chef_run, nvidia_enabled: nil)
           chef_run.find_resource('nvidia_dcgm', 'setup')
         end
 
-        if %w(centos amazon).include?(platform)
+        if %w(centos7 amazon2).include?("#{platform}#{version}")
           it "is not enabled" do
             expect(resource._nvidia_dcgm_enabled).to eq(false)
           end
@@ -164,7 +164,7 @@ def self.setup(chef_run, nvidia_enabled: nil)
             ConvergeNvidiaDcgm.setup(chef_run)
           end
 
-          if %w(centos amazon).include?(platform)
+          if %w(centos7 amazon2).include?("#{platform}#{version}")
             it 'does not install datacenter gpu manager' do
               is_expected.not_to run_bash('Install datacenter-gpu-manager')
             end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_driver_spec.rb

@@ -221,21 +221,34 @@ def self.setup(chef_run, nvidia_driver_version: nil)
         end
 
         if platform == 'amazon'
-          compiler_path = version == 2023 ? 'CC=/usr/bin/gcc' : 'CC=/usr/bin/gcc10-gcc'
-          it 'installs gcc10' do
-            is_expected.to install_package('gcc10').with_retries(10).with_retry_delay(5)
+          compiler_version = version == '2023' ? 'gcc' : 'gcc10'
+          compiler_path = version == '2023' ? 'CC=/usr/bin/gcc' : 'CC=/usr/bin/gcc10-gcc'
+          if version == '2'
+            it "installs #{compiler_version}" do
+              is_expected.to install_package(compiler_version).with_retries(10).with_retry_delay(5)
+            end
+            it 'creates dkms/nvidia.conf' do
+              is_expected.to create_template('/etc/dkms/nvidia.conf').with(
+                source: 'nvidia/amazon/dkms/nvidia.conf.erb',
+                cookbook: 'aws-parallelcluster-platform',
+                owner: 'root',
+                group: 'root',
+                mode: '0644',
+                variables: { compiler_path: compiler_path }
+              )
+            end
+          else
+            # Amazon Linux 2023 is expected to install the compiler and create nvidia conf when kernel version is 6.
+            # Here we are testing with kernel version 5
+            it "does not install #{compiler_version}" do
+              is_expected.not_to install_package(compiler_version).with_retries(10).with_retry_delay(5)
+            end
+
+            it 'does not create dkms/nvidia.conf' do
+              is_expected.not_to create_template('/etc/dkms/nvidia.conf')
+            end
           end
 
-          it 'creates dkms/nvidia.conf' do
-            is_expected.to create_template('/etc/dkms/nvidia.conf').with(
-              source: 'nvidia/amazon/dkms/nvidia.conf.erb',
-              cookbook: 'aws-parallelcluster-platform',
-              owner: 'root',
-              group: 'root',
-              mode: '0644',
-              variables: { compiler_path: compiler_path }
-            )
-          end
           it 'installs nvidia driver' do
             is_expected.to run_bash('nvidia.run advanced')
               .with(