Upgrade Slurm and DCV versions and Add DCV support for AL2023 (#2986)

* Upgrade slurm version

* Support DCV on Alinux2023

* Update change log

* Fix unit test

Author: hgreebe

CHANGELOG.md

@@ -11,6 +11,8 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 
 **CHANGES**
 - Ubuntu 20.04 is no longer supported.
+- Upgrade Slurm to version 24.11.5.
+- Upgrade DCV to version 2024.0-19030.
 
 3.13.2
 ------

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

@@ -32,13 +32,13 @@
 default['cluster']['dcv']['authenticator']['private_key'] = "#{node['cluster']['etc_dir']}/ext-auth-private-key.pem"
 default['cluster']['dcv']['authenticator']['virtualenv_name'] = "dcv_authenticator_virtualenv"
 default['cluster']['dcv']['authenticator']['virtualenv_path'] = "#{node['cluster']['system_pyenv_root']}/versions/#{node['cluster']['python-version']}/envs/#{node['cluster']['dcv']['authenticator']['virtualenv_name']}"
-default['cluster']['dcv']['version'] = '2024.0-18131'
+default['cluster']['dcv']['version'] = '2024.0-19030'
 default['cluster']['dcv_port'] = 8443
 
-default['cluster']['dcv']['server']['version'] = '2024.0.18131-1'
-default['cluster']['dcv']['xdcv']['version'] = '2024.0.631-1'
-default['cluster']['dcv']['gl']['version'] = '2024.0.1078-1'
-default['cluster']['dcv']['web_viewer']['version'] = '2024.0.18131-1'
+default['cluster']['dcv']['server']['version'] = '2024.0.19030-1'
+default['cluster']['dcv']['xdcv']['version'] = '2024.0.654-1'
+default['cluster']['dcv']['gl']['version'] = '2024.0.1096-1'
+default['cluster']['dcv']['web_viewer']['version'] = '2024.0.19030-1'
 
 # OpenSSH settings for AWS ParallelCluster instances
 default['openssh']['server']['protocol'] = '2'

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_alinux2023.rb

@@ -19,7 +19,17 @@
 use 'partial/_dcv_common'
 use 'partial/_rhel_common'
 
-# DCV is not supported for AL2023
-def dcv_supported?
-  false
+action_class do
+  def pre_install
+    execute 'Install gnome desktop' do
+      command 'dnf groupinstall "Desktop" -y'
+      retries 3
+      retry_delay 5
+    end
+
+    package "xorg-x11-server-Xorg" do
+      retries 3
+      retry_delay 5
+    end
+  end
 end

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb

@@ -21,8 +21,8 @@
 
 def dcv_sha256sum
   if arm_instance?
-    '48bb605dbb5f28af79b94de9239a8c3e7811e9e47078d8985d036915f2a34217'
+    '065f7f63b8bf92a062c85ea749d7bdbaff66acb4d6404cf31200889f1461b624'
   else
-    'b30a57f5029b9d8acb59db9fc72f1dbc7c6a33d76dbbfe02017cec553c5b86f9'
+    'd631d48e8b268d91c55cc3c56f59c9aeaba0217bc1f649f8c6c75957d41e011b'
   end
 end

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu24.rb

@@ -21,8 +21,8 @@
 
 def dcv_sha256sum
   if arm_instance?
-    '95e4a364a78de6febbdeb877febd998099f59fbb4c4226fe6dd27fa4b5afc809'
+    'eddd8ef8afbd3e960641b0bde4d3f76faf9e5a1c9b5b40c50da98af62cb53635'
   else
-    '2cebf01c1fb5389d349ba22fdd8a85dec179bbf24c86f252535e8da43fb4c705'
+    'fbbe1157bed43d0da2c2f0da8c13645649d8eb7d722d9855f052b32c382c9f64'
   end
 end

cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb

@@ -18,27 +18,33 @@ def dcv_sha256sum
     case el_string
     when "amzn2"
       # ALINUX2
-      '894f5a0b2c57bb9433a7124f152b0930d962ab0f2cfc6ea0f1e159893d667e86'
+      '4b77afb807c4aa87e0ac958223f12887d4fc2f1e95adf313cf42025b94adfed8'
+    when "amzn2023"
+      # ALINUX2023
+      "60001ea60e91513b5c5018c38c2178cb0fac5cd0f15875ccf694ab95d7cfe661"
     when "el8"
       # RHEL and Rocky8
-      '7647d00782fb7f14668571f1e48fffa2b8b587d878b7632b03f40bbb92a757ad'
+      '1f59654f27e5f6c148bdc8520994fe2a150a84650af3bc9fefce7f07ff7d310d'
     when "el9"
       # RHEL and Rocky9
-      'f9b2fa95f84059c7168ef924b7ffe8b6f4d0d69e2e39280096d4bf76fdfb597c'
+      '59ed3e6b2698aad03112d759f8bf9a6ffa6850fdf1072fa4afb4756e7314e19d'
     else
       ''
     end
   else
     case el_string
     when "amzn2"
       # ALINUX2
-      '81e85db767e36c36877879e1d3afc0f20127b9bd81b845fc8599feb9abd04f24'
+      '3b9a0ad9c9d521b8a9f6d5c2db0640bd97413d34fe32d418a8a7fd9cae7cc828'
+    when "amzn2023"
+      # ALINUX2023
+      "35128b988dee4f1f4582bd912dc4764b8712c1f0e3a35082a5da7e039eb7ff92"
     when "el8"
       # RHEL and Rocky8
-      'f879513272ac351712814bd969e3862fc7717ada9cfdf1ec227876b0e8ebc77d'
+      'b9d24624b857d4315bcd5d90047d18d4924940153d98828b67ae78521916dd83'
     when "el9"
       # RHEL and Rocky9
-      '5d631b5c0f2f6b21d0e56023432766994e2de5cc13f22c70a954cd643cde5b84'
+      '473b439f95a3354c99718d97338256a280431c7103b5d4bed0d8d63dfc8f6312'
     else
       ''
     end
@@ -47,7 +53,7 @@ def dcv_sha256sum
 
 def el_string
   if platform?('amazon')
-    "amzn2"
+    "amzn#{node['platform_version'].to_i}"
   else
     "el#{node['platform_version'].to_i}"
   end

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

@@ -38,19 +38,9 @@ def self.nothing(chef_run)
       end
 
       context 'when on arm' do
-        before do
+        it "is true" do
           allow_any_instance_of(Object).to receive(:arm_instance?).and_return(true)
-        end
-
-        case "#{platform}#{version}"
-        when "amazon2023"
-          it "is false" do
-            expect(resource.dcv_supported?).to eq(false)
-          end
-        else
-          it "is true" do
-            expect(resource.dcv_supported?).to eq(true)
-          end
+          expect(resource.dcv_supported?).to eq(true)
         end
 
         it 'executes nothing action of dcv resource' do
@@ -59,10 +49,9 @@ def self.nothing(chef_run)
       end
 
       context 'when not on arm' do
-        is_supported = !("#{platform}#{version}" == 'amazon2023')
-        it "is #{is_supported}" do
+        it "is true" do
           allow_any_instance_of(Object).to receive(:arm_instance?).and_return(false)
-          expect(resource.dcv_supported?).to eq(is_supported)
+          expect(resource.dcv_supported?).to eq(true)
         end
       end
     end
@@ -144,7 +133,14 @@ 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")
-        elsif "#{platform}#{version}" != 'amazon2023'
+        elsif "#{platform}#{version}" == "amazon2023"
+          dcv_platform_version_pkg = "amzn2023"
+          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}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
+          expect(resource.xdcv).to eq("nice-xdcv-#{xdcv_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
+          expect(resource.dcv_web_viewer).to eq("nice-dcv-web-viewer-#{dcv_webviewer_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
+          expect(resource.dcv_gl).to eq("nice-dcv-gl-#{dcv_gl_version}.#{dcv_platform_version_pkg}.#{dcv_url_arch}.rpm")
+        else
           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}")

cookbooks/aws-parallelcluster-slurm/attributes/versions.rb

@@ -1,8 +1,8 @@
 # Slurm
-default['cluster']['slurm']['version'] = '24-05-8-1'
+default['cluster']['slurm']['version'] = '24-11-5-1'
 default['cluster']['slurm']['commit'] = ''
 default['cluster']['slurm']['branch'] = ''
-default['cluster']['slurm']['sha256'] = '06f4b837c3f7ec523a8924a5fee23d8305f20ca8ef3ad6128e128e87986821e4'
+default['cluster']['slurm']['sha256'] = 'e1a5547edd212c38b5e3230a284133f777b32746551f094aaa81cc4af375e332'
 default['cluster']['slurm']['base_url'] = "#{node['cluster']['artifacts_s3_url']}/dependencies/slurm"
 # Munge
 default['cluster']['munge']['munge_version'] = '0.5.16'