Upgrade ARM PL to 23.10

Different GCC versions are used for different operating systems. For existing operating systems, we keep the version unchanged (9.3 for alinux2, centos7, ubuntu20, rhel8, rocky8; 11.3 for ubuntu22). For newly added OSes (RHEL9 and Rocky9), we use 11.3 because 9.3 is not available.

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_amazon2.rb

@@ -18,6 +18,10 @@
 
 action_class do
   def armpl_platform
-    'RHEL-8'
+    'AmazonLinux-2'
+  end
+
+  def gcc_major_minor_version
+    '9.3'
   end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_centos7.rb

@@ -30,4 +30,8 @@
   def armpl_platform
     'RHEL-7'
   end
+
+  def gcc_major_minor_version
+    '9.3'
+  end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_redhat8.rb

@@ -20,6 +20,15 @@
 
 action_class do
   def armpl_platform
-    'RHEL-8'
+    "RHEL-#{node['platform_version'].to_i}"
+  end
+
+  def gcc_major_minor_version
+    case node['platform_version'].to_i
+    when 8
+      '9.3'
+    else
+      '11.3'
+    end
   end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_rocky8.rb

@@ -20,6 +20,15 @@
 
 action_class do
   def armpl_platform
-    'RHEL-8'
+    "RHEL-#{node['platform_version'].to_i}"
+  end
+
+  def gcc_major_minor_version
+    case node['platform_version'].to_i
+    when 8
+      '9.3'
+    else
+      '11.3'
+    end
   end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu20.rb

@@ -26,4 +26,8 @@ def armpl_platform
   def modulefile_dir
     "/usr/share/modules/modulefiles"
   end
+
+  def gcc_major_minor_version
+    '9.3'
+  end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu22.rb

@@ -18,11 +18,6 @@
 
 use 'partial/_arm_pl_common.rb'
 
-property :armpl_major_minor_version, String, default: '23.04'
-property :armpl_patch_version, String, default: '1'
-property :gcc_major_minor_version, String, default: '11.3'
-property :gcc_patch_version, String, default: '0'
-
 action_class do
   def armpl_platform
     "Ubuntu-#{node['platform_version']}"
@@ -31,4 +26,8 @@ def armpl_platform
   def modulefile_dir
     "/usr/share/modules/modulefiles"
   end
+
+  def gcc_major_minor_version
+    '11.3'
+  end
 end

cookbooks/aws-parallelcluster-platform/resources/arm_pl/partial/_arm_pl_common.rb

@@ -27,9 +27,7 @@
 # We upload ArmPL to a ParallelCluster bucket (account for it in scope of the upgrade) and download it from there
 # to install ArmPL on the AMI.
 # We download gcc directly from gnu.org repository to install correct gcc version on the AMI.
-property :armpl_major_minor_version, String, default: '21.0'
-property :armpl_patch_version, String, default: '0'
-property :gcc_major_minor_version, String, default: '9.3'
+property :armpl_major_minor_version, String, default: '23.10'
 property :gcc_patch_version, String, default: '0'
 
 action :arm_pl_prerequisite do
@@ -53,8 +51,8 @@
 
   action_arm_pl_prerequisite
 
-  armpl_version = "#{new_resource.armpl_major_minor_version}.#{new_resource.armpl_patch_version}"
-  armpl_tarball_name = "arm-performance-libraries_#{armpl_version}_#{armpl_platform}_gcc-#{new_resource.gcc_major_minor_version}.tar"
+  armpl_version = "#{new_resource.armpl_major_minor_version}"
+  armpl_tarball_name = "arm-performance-libraries_#{armpl_version}_#{armpl_platform}_gcc-#{gcc_major_minor_version}.tar"
 
   armpl_url = %W(
     https://#{new_resource.region}-aws-parallelcluster.s3.#{new_resource.region}.#{new_resource.aws_domain}
@@ -92,9 +90,9 @@
   directory "#{modulefile_dir}/armpl"
 
   armpl_license_dir = if new_resource.armpl_major_minor_version == "21.0"
-                        "/opt/arm/armpl/#{armpl_version}/arm-performance-libraries_#{new_resource.armpl_major_minor_version}_gcc-#{new_resource.gcc_major_minor_version}/license_terms"
+                        "/opt/arm/armpl/#{armpl_version}/arm-performance-libraries_#{new_resource.armpl_major_minor_version}_gcc-#{gcc_major_minor_version}/license_terms"
                       else
-                        "/opt/arm/armpl/#{armpl_version}/arm-performance-libraries_#{armpl_version}_gcc-#{new_resource.gcc_major_minor_version}/license_terms"
+                        "/opt/arm/armpl/#{armpl_version}/arm-performance-libraries_#{armpl_version}_gcc-#{gcc_major_minor_version}/license_terms"
                       end
 
   # arm performance library modulefile configuration
@@ -108,11 +106,11 @@
       armpl_version: armpl_version,
       armpl_major_minor_version: new_resource.armpl_major_minor_version,
       armpl_license_dir: armpl_license_dir,
-      gcc_major_minor_version: new_resource.gcc_major_minor_version
+      gcc_major_minor_version: gcc_major_minor_version
     )
   end
 
-  gcc_version = "#{new_resource.gcc_major_minor_version}.#{new_resource.gcc_patch_version}"
+  gcc_version = "#{gcc_major_minor_version}.#{new_resource.gcc_patch_version}"
   gcc_url = "https://ftp.gnu.org/gnu/gcc/gcc-#{gcc_version}/gcc-#{gcc_version}.tar.gz"
   gcc_tarball = "#{new_resource.sources_dir}/gcc-#{gcc_version}.tar.gz"
 
@@ -152,7 +150,7 @@
     creates '/opt/arm/armpl/gcc'
   end
 
-  gcc_modulefile = "/opt/arm/armpl/#{armpl_version}/modulefiles/armpl/gcc-#{new_resource.gcc_major_minor_version}"
+  gcc_modulefile = "/opt/arm/armpl/#{armpl_version}/modulefiles/armpl/gcc-#{gcc_major_minor_version}"
 
   # gcc modulefile configuration
   template gcc_modulefile do
@@ -170,9 +168,8 @@
   # to dependencies (for instance, test code)
   # Complete versions are intentionally redundant.
   node.default['cluster']['armpl']['major_minor_version'] = new_resource.armpl_major_minor_version
-  node.default['cluster']['armpl']['patch_version'] = new_resource.armpl_patch_version
   node.default['cluster']['armpl']['version'] = armpl_version
-  node.default['cluster']['armpl']['gcc']['major_minor_version'] = new_resource.gcc_major_minor_version
+  node.default['cluster']['armpl']['gcc']['major_minor_version'] = gcc_major_minor_version
   node.default['cluster']['armpl']['gcc']['patch_version'] = new_resource.gcc_patch_version
   node.default['cluster']['armpl']['gcc']['version'] = gcc_version
 

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

@@ -16,18 +16,7 @@ def self.setup(chef_run)
       cached(:aws_region) { 'test_region' }
       cached(:aws_domain) { 'test_domain' }
       cached(:armpl_major_minor_version) do
-        if platform == 'ubuntu' && version == '22.04'
-          '23.04'
-        else
-          '21.0'
-        end
-      end
-      cached(:armpl_patch_version) do
-        if platform == 'ubuntu' && version == '22.04'
-          '1'
-        else
-          '0'
-        end
+        '23.10'
       end
 
       cached(:armpl_platform) do
@@ -36,13 +25,15 @@ def self.setup(chef_run)
           'RHEL-7'
         when 'ubuntu'
           "Ubuntu-#{version}"
+        when 'amazon'
+          "AmazonLinux-2"
         else
-          'RHEL-8'
+          "RHEL-#{version}"
         end
       end
 
       cached(:gcc_major_minor_version) do
-        if platform == 'ubuntu' && version == '22.04'
+        if platform == 'ubuntu' && version == '22.04' || version == '9'
           '11.3'
         else
           '9.3'
@@ -52,7 +43,7 @@ def self.setup(chef_run)
       cached(:gcc_patch_version) { '0' }
       cached(:sources_dir) { 'sources_test_dir' }
       cached(:modulefile_dir) { platform == 'ubuntu' ? '/usr/share/modules/modulefiles' : '/usr/share/Modules/modulefiles' }
-      cached(:armpl_version) { "#{armpl_major_minor_version}.#{armpl_patch_version}" }
+      cached(:armpl_version) { "#{armpl_major_minor_version}" }
       cached(:armpl_tarball_name) { "arm-performance-libraries_#{armpl_version}_#{armpl_platform}_gcc-#{gcc_major_minor_version}.tar" }
       cached(:armpl_url) { "https://#{aws_region}-aws-parallelcluster.s3.#{aws_region}.#{aws_domain}/archives/armpl/#{armpl_platform}/#{armpl_tarball_name}" }
       cached(:armpl_installer) { "#{sources_dir}/#{armpl_tarball_name}" }
@@ -187,7 +178,6 @@ def self.setup(chef_run)
 
         it 'sets node attributes' do
           expect(node['cluster']['armpl']['major_minor_version']).to eq(armpl_major_minor_version)
-          expect(node['cluster']['armpl']['patch_version']).to eq(armpl_patch_version)
           expect(node['cluster']['armpl']['version']).to eq(armpl_version)
           expect(node['cluster']['armpl']['gcc']['major_minor_version']).to eq(gcc_major_minor_version)
           expect(node['cluster']['armpl']['gcc']['patch_version']).to eq(gcc_patch_version)