simplify code

Author: hanwen-cluster

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

@@ -17,7 +17,6 @@
 end
 
 use 'partial/_install_packages_common.rb'
-use 'partial/_install_packages_rhel_amazon.rb'
 
 action :install do
   package new_resource.packages do

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

@@ -17,7 +17,6 @@
 end
 
 use 'partial/_install_packages_common.rb'
-use 'partial/_install_packages_rhel_rocky.rb'
 
 def default_packages
   # environment-modules required by EFA, Intel MPI and ARM PL

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

@@ -17,7 +17,6 @@
 end
 
 use 'partial/_install_packages_common.rb'
-use 'partial/_install_packages_rhel_rocky.rb'
 
 def default_packages
   # environment-modules required by EFA, Intel MPI and ARM PL

cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_ubuntu22+.rb

@@ -19,7 +19,6 @@
 default_action :setup
 
 use 'partial/_install_packages_common.rb'
-use 'partial/_install_packages_debian.rb'
 
 def default_packages
   # environment-modules required by EFA, Intel MPI and ARM PL

cookbooks/aws-parallelcluster-platform/resources/install_packages/partial/_install_packages_common.rb

@@ -19,6 +19,12 @@
          default: lazy { default_packages },
          description: 'Packages for the node'
 
+action :install do
+  robust_package "install_packages #{new_resource.name}" do
+    packages new_resource.packages
+  end
+end
+
 action :install_base_packages do
   install_packages 'default' do
     action :install

cookbooks/aws-parallelcluster-platform/resources/install_packages/partial/_install_packages_debian.rb

@@ -40,16 +40,16 @@ def self.setup(chef_run)
               .with(flush_cache: { before: true })
           end
         else
-          it 'installs default packages with mirror refresh retry logic' do
-            is_expected.to run_ruby_block('install_packages_with_metadata_refresh')
+          it 'installs default packages via robust_package' do
+            is_expected.to install_robust_package('install_packages default')
+              .with(packages: default_packages)
           end
         end
 
       elsif platform == 'ubuntu'
-        it 'installs base packages' do
-          is_expected.to install_package(default_packages)
-            .with(retries: 10)
-            .with(retry_delay: 5)
+        it 'installs base packages via robust_package' do
+          is_expected.to install_robust_package('install_packages default')
+            .with(packages: default_packages)
         end
 
       else

cookbooks/aws-parallelcluster-platform/resources/install_packages/partial/_install_packages_rhel_amazon.rb

@@ -24,19 +24,10 @@ def self.setup(chef_run)
 end
 
 describe 'slurm_dependencies' do
-  shared_examples 'installs packages from OS repos via package resource' do |expected_packages|
-    it 'installs expected packages' do
-      is_expected.to install_package(expected_packages)
-    end
-
-    it 'does not build http-parser from source' do
-      is_expected.not_to run_bash('make install')
-    end
-  end
-
-  shared_examples 'installs packages from OS repos via dnf ruby_block' do
-    it 'installs packages with mirror refresh retry logic' do
-      is_expected.to run_ruby_block('install_packages_with_metadata_refresh')
+  shared_examples 'installs packages from OS repos via robust_package' do |expected_packages|
+    it 'installs expected packages via robust_package' do
+      is_expected.to install_robust_package('install_packages install')
+        .with(packages: expected_packages)
     end
 
     it 'does not build http-parser from source' do
@@ -94,16 +85,16 @@ def self.setup(chef_run)
 
   context "on redhat8" do
     include_context 'converge slurm_dependencies', 'redhat', '8'
-    include_examples 'installs packages from OS repos via dnf ruby_block'
+    include_examples 'installs packages from OS repos via robust_package', %w(json-c-devel http-parser-devel lua-devel perl dbus-devel)
   end
 
   context "on rocky8" do
     include_context 'converge slurm_dependencies', 'rocky', '8'
-    include_examples 'installs packages from OS repos via dnf ruby_block'
+    include_examples 'installs packages from OS repos via robust_package', %w(json-c-devel http-parser-devel lua-devel perl dbus-devel)
   end
 
   context "on ubuntu22.04" do
     include_context 'converge slurm_dependencies', 'ubuntu', '22.04'
-    include_examples 'installs packages from OS repos via package resource', %w(libjson-c-dev libhttp-parser-dev libswitch-perl liblua5.3-dev)
+    include_examples 'installs packages from OS repos via robust_package', %w(libjson-c-dev libhttp-parser-dev libswitch-perl liblua5.3-dev)
   end
 end