Work-in-progress RHEL9 Rocky9

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

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

@@ -15,30 +15,56 @@
 
 def dcv_sha256sum
   if arm_instance?
-    '37aaaabfe1b8dde83254c738aa562b7eb7b1663cea09a53cedf9dabe5ddbb184'
+    case el_string
+    when "el7"
+      '37aaaabfe1b8dde83254c738aa562b7eb7b1663cea09a53cedf9dabe5ddbb184'
+    when "el8"
+      'c5366bde8fb49bb41f2bb04e3390e5bda9aa668c0122e4fbf663e9a18c049edf'
+    when "el9"
+      '07148327f30dae656b338e24102945830601e85df4e135029b624df1e9ee3c2e'
+    else
+      ''
+    end
+  else
+    case el_string
+    when "el7"
+      'e82e434a3f0c5d1a48d7cda2b6100ce51ae250d93b6a17b2fb81ba0fda463b3b'
+    when "el8"
+      '28a15bb557f59580f3b58d9bf99430d27d98efbaa9007ab3b2eca46e1a51fa4f'
+    when "el9"
+      'eb906f41b0a064005499ab6a1be42c8d218a3fbaf9444cb907990aa6171bdea4'
+    else
+      ''
+    end
+  end
+end
+
+def el_string
+  if node['platform'] == "amazon"
+    "el7"
   else
-    'e82e434a3f0c5d1a48d7cda2b6100ce51ae250d93b6a17b2fb81ba0fda463b3b'
+    "el#{node['platform_version'].to_i}"
   end
 end
 
 def dcv_package
-  "nice-dcv-#{node['cluster']['dcv']['version']}-el7-#{dcv_url_arch}"
+  "nice-dcv-#{node['cluster']['dcv']['version']}-#{el_string}-#{dcv_url_arch}"
 end
 
 def dcv_server
-  "nice-dcv-server-#{node['cluster']['dcv']['server']['version']}.el7.#{dcv_url_arch}.rpm"
+  "nice-dcv-server-#{node['cluster']['dcv']['server']['version']}.#{el_string}.#{dcv_url_arch}.rpm"
 end
 
 def xdcv
-  "nice-xdcv-#{node['cluster']['dcv']['xdcv']['version']}.el7.#{dcv_url_arch}.rpm"
+  "nice-xdcv-#{node['cluster']['dcv']['xdcv']['version']}.#{el_string}.#{dcv_url_arch}.rpm"
 end
 
 def dcv_web_viewer
-  "nice-dcv-web-viewer-#{node['cluster']['dcv']['web_viewer']['version']}.el7.#{dcv_url_arch}.rpm"
+  "nice-dcv-web-viewer-#{node['cluster']['dcv']['web_viewer']['version']}.#{el_string}.#{dcv_url_arch}.rpm"
 end
 
 def dcv_gl
-  "nice-dcv-gl-#{node['cluster']['dcv']['gl']['version']}.el7.#{dcv_url_arch}.rpm"
+  "nice-dcv-gl-#{node['cluster']['dcv']['gl']['version']}.#{el_string}.#{dcv_url_arch}.rpm"
 end
 
 action_class do

cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_redhat8.rb

@@ -24,11 +24,11 @@ def default_packages
   # Removed libssh2-devel from base_packages since is not shipped by RedHat 8 and in conflict with package libssh-0.9.6-3.el8.x86_64
   # iptables needed for IMDS setup
   %w(vim ksh tcsh zsh openssl-devel ncurses-devel pam-devel net-tools openmotif-devel
-     libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf pyparted libtool
-     httpd boost-devel redhat-lsb mlocate R atlas-devel
+     libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf libtool
+     httpd boost-devel mlocate R atlas-devel
      blas-devel libffi-devel dkms libedit-devel jq
      libical-devel sendmail libxml2-devel libglvnd-devel
-     python2 python2-pip libgcrypt-devel libevent-devel glibc-static bind-utils
+     libgcrypt-devel libevent-devel glibc-static bind-utils
      iproute NetworkManager-config-routing-rules python3 python3-pip iptables libcurl-devel yum-plugin-versionlock
      coreutils moreutils curl environment-modules gcc gcc-c++ bzip2)
 end

cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_rocky8.rb

@@ -48,11 +48,11 @@ def default_packages
   # environment-modules required by EFA, Intel MPI and ARM PL
   # iptables needed for IMDS setup
   packages = %w(vim ksh tcsh zsh openssl-devel ncurses-devel pam-devel net-tools openmotif-devel
-     libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf pyparted libtool
-     httpd boost-devel redhat-lsb mlocate R atlas-devel
+     libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf libtool
+     httpd boost-devel mlocate R atlas-devel
      blas-devel libffi-devel dkms libedit-devel jq
      libical-devel sendmail libxml2-devel libglvnd-devel
-     python2 python2-pip libgcrypt-devel libevent-devel glibc-static bind-utils
+     libgcrypt-devel libevent-devel glibc-static bind-utils
      iproute NetworkManager-config-routing-rules python3 python3-pip iptables libcurl-devel yum-plugin-versionlock
      moreutils curl environment-modules gcc gcc-c++ bzip2)
   packages.append("coreutils") unless on_docker?  # on docker image coreutils conflict with coreutils-single, already installed on it

cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_redhat8.rb

@@ -32,7 +32,7 @@
 
   execute 'yum-config-manager-rhel' do
     # Needed by hwloc-devel blas-devel libedit-devel and glibc-static packages
-    command "yum-config-manager --enable codeready-builder-for-rhel-8-rhui-rpms"
+    command "yum-config-manager --enable codeready-builder-for-rhel-#{node['platform_version'].to_i}-rhui-rpms"
   end unless on_docker?
 
   execute 'yum-config-manager_skip_if_unavail' do

cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_rocky8.rb

@@ -17,6 +17,15 @@
 end
 unified_mode true
 
+def powertool_name
+  case node['platform_version']
+    when '8'
+      "powertools"
+    when '9'
+      "crb"
+    end
+end
+
 use 'partial/_package_repos_rpm.rb'
 
 default_action :setup
@@ -32,7 +41,7 @@
 
   execute 'yum-config-manager-powertools' do
     # Needed by hwloc-devel blas-devel libedit-devel and glibc-static packages
-    command "yum-config-manager --enable powertools"
+    command "yum-config-manager --enable #{powertool_name}"
   end
 
   execute 'yum-config-manager_skip_if_unavail' do

cookbooks/aws-parallelcluster-slurm/kitchen.slurm-install.yml

@@ -25,6 +25,8 @@ suites:
         - /tag:install_jwt_dependencies/
     attributes:
       resource: jwt_dependencies
+      dependencies:
+        - resource:package_repos
   - name: mysql_client
     run_list:
       - recipe[aws-parallelcluster-tests::setup]