Improve build-image on non-latest Rocky

cookbooks/aws-parallelcluster-environment/kitchen.environment-config.yml

@@ -517,7 +517,7 @@ suites:
         - /iptables_correctly_configured/
     attributes:
       dependencies:
-        - 'resource:install_packages:install_kernel_source {"packages": ["iptables"]}'
+        - 'resource:package { "package_name": "iptables" }'
       cluster:
         node_type: HeadNode
         scheduler: slurm
@@ -533,7 +533,7 @@ suites:
         - /iptables_correctly_configured/
     attributes:
       dependencies:
-        - 'resource:install_packages:install_kernel_source {"packages": ["iptables"]}'
+        - 'resource:package { "package_name": "iptables" }'
       cluster:
         node_type: LoginNode
         scheduler: slurm

cookbooks/aws-parallelcluster-platform/kitchen.platform-config.yml

@@ -30,7 +30,6 @@ suites:
       resource: dcv:configure
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
         - recipe:aws-parallelcluster-platform::nvidia_install
@@ -52,7 +51,6 @@ suites:
     attributes:
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
         - recipe:aws-parallelcluster-platform::nvidia_install
@@ -74,7 +72,6 @@ suites:
     attributes:
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
         - recipe:aws-parallelcluster-platform::nvidia_install
@@ -206,7 +203,6 @@ suites:
           enabled: true
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
         - recipe:aws-parallelcluster-platform::nvidia_install

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

@@ -108,7 +108,6 @@ suites:
       resource: nvidia_driver
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
       cluster:
@@ -141,7 +140,6 @@ suites:
       resource: gdrcopy
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
         - resource:nvidia_driver
@@ -275,7 +273,6 @@ suites:
     attributes:
       dependencies:
         - resource:package_repos
-        - resource:install_packages:install_kernel_source
         - 'resource:package { "package_name": "dkms" }'
         - resource:build_tools
       cluster:

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

@@ -19,39 +19,6 @@
 use 'partial/_install_packages_common.rb'
 use 'partial/_install_packages_rhel_amazon.rb'
 
-action :install_kernel_source do
-  # Previous releases are moved into a vault area once a new minor release version is available for at least a week.
-  # https://wiki.rockylinux.org/rocky/repo/#notes-on-devel
-  bash "Install kernel source" do
-    user 'root'
-    code <<-INSTALL_KERNEL_SOURCE
-    package="#{kernel_source_package}-#{kernel_source_package_version}"
-
-    # try to install kernel source for a specific release version
-    dnf install -y ${package} --releasever #{node['platform_version']}
-    if [ $? -ne 0 ]; then
-      # Previous releases are moved into a vault area once a new minor release version is available for at least a week.
-      # https://wiki.rockylinux.org/rocky/repo/#notes-on-devel
-      base_os_package_url="https://dl.rockylinux.org/vault/rocky/#{node['platform_version']}/BaseOS/#{node['kernel']['machine']}/os/Packages/k/${package}.rpm"
-      appstream_package_url="https://dl.rockylinux.org/vault/rocky/#{node['platform_version']}/AppStream/#{node['kernel']['machine']}/os/Packages/k/${package}.rpm"
-      base_os_status_code=$(curl --write-out '%{http_code}' --silent --output /dev/null ${base_os_package_url})
-      appstream_status_code=$(curl --write-out '%{http_code}' --silent --output /dev/null ${appstream_package_url})
-      set -e
-      if [ $base_os_status_code != 404 ]; then
-        dnf install -y ${base_os_package_url}
-      elif [ $appstream_status_code != 404 ]; then
-        dnf install -y ${appstream_package_url}
-      fi
-    fi
-    dnf clean all
-    INSTALL_KERNEL_SOURCE
-  end unless on_docker?
-end
-
-def kernel_source_package_version
-  node['kernel']['release']
-end
-
 def default_packages
   # environment-modules required by EFA, Intel MPI and ARM PL
   # iptables needed for IMDS setup

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

@@ -25,21 +25,11 @@
   end unless redhat_on_docker?
 end
 
-action :install_kernel_source do
-  package "install kernel packages" do
-    package_name kernel_source_package
-    version kernel_source_package_version
-    retries 3
-    retry_delay 5
-  end unless on_docker?
-end
-
 action :install_extras do
   # nothing
 end
 
 action :setup do
   action_install_extras
-  action_install_kernel_source
   action_install_base_packages
 end

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

@@ -19,20 +19,3 @@
     retry_delay 5
   end
 end
-
-action :install_kernel_source do
-  package "install kernel packages" do
-    package_name kernel_source_package
-    version kernel_source_package_version
-    retries 3
-    retry_delay 5
-  end unless on_docker?
-end
-
-def kernel_source_package
-  "linux-headers-#{node['kernel']['release']}"
-end
-
-def kernel_source_package_version
-  nil
-end

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

@@ -20,11 +20,3 @@
     flush_cache({ before: true })
   end
 end
-
-def kernel_source_package
-  'kernel-devel'
-end
-
-def kernel_source_package_version
-  node['kernel']['release'].chomp('.x86_64').chomp('.aarch64')
-end

cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_alinux2023.rb

@@ -34,5 +34,5 @@ def compiler_path
 
 def extra_packages
   kernel_version = node['kernel']['release'].chomp('.x86_64').chomp('.aarch64')
-  ["kernel-modules-extra-#{kernel_version}", "kernel-modules-extra-common-#{kernel_version}"]
+  ["kernel-modules-extra-#{kernel_version}", "kernel-modules-extra-common"]
 end

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

@@ -15,8 +15,6 @@ def self.setup(chef_run)
     context "on #{platform}#{version}" do
       cached(:default_packages) { %w(package1 package2) }
       cached(:kernel_release) { 'kernel_release.x86_64' }
-      cached(:kernel_source_package) { 'kernel_source_package' }
-      cached(:kernel_source_package_version) { 'kernel_source_package_version' }
       cached(:chef_run) do
         stubs_for_resource('install_packages') do |res|
           allow(res).to receive(:default_packages).and_return(default_packages)
@@ -41,24 +39,6 @@ def self.setup(chef_run)
             .with(flush_cache: { before: true })
         end
 
-        if platform == 'rocky'
-          it 'installs kernel source' do
-            is_expected.to run_bash('Install kernel source')
-              .with(user: 'root')
-              .with_code(/set -e/)
-              .with_code(/dnf install -y #{kernel_source_package}-#{kernel_source_package_version} --releasever #{platform}/)
-              .with_code(/dnf clean all/)
-          end
-        else
-          it 'installs kernel source' do
-            is_expected.to install_package("install kernel packages")
-              .with(package_name: 'kernel-devel')
-              .with(version: 'kernel_release')
-              .with(retries: 3)
-              .with(retry_delay: 5)
-          end
-        end
-
         if platform == 'amazon' && version == '2'
           it 'installs extra packages' do
             is_expected.to install_alinux_extras_topic('R3.4')
@@ -72,13 +52,6 @@ def self.setup(chef_run)
             .with(retry_delay: 5)
         end
 
-        it 'installs kernel source' do
-          is_expected.to install_package("install kernel packages")
-            .with(package_name: "linux-headers-#{kernel_release}")
-            .with(retries: 3)
-            .with(retry_delay: 5)
-        end
-
       else
         pending "Implement for #{platform}"
       end

cookbooks/aws-parallelcluster-platform/test/controls/install_packages_spec.rb

@@ -44,10 +44,6 @@
       it { should be_installed }
     end
 
-    describe package('kernel-devel') do
-      it { should be_installed }
-    end unless os_properties.on_docker?
-
     # Check amazon linux2 extra
     if os_properties.alinux2?
       describe package('R-core') do