From 158fe51dfedf69a5a784d538625279fe323d8ddb Mon Sep 17 00:00:00 2001 From: Himani Anil Deshpande Date: Wed, 19 Mar 2025 15:12:46 -0400 Subject: [PATCH] Deprecate support for Ubuntu 20.04 --- .github/workflows/dokken-system-tests.yml | 1 - CHANGELOG.md | 3 ++ ...h_ubuntu20+.rb => cloudwatch_ubuntu22+.rb} | 2 +- ...untu20+.rb => ec2_udev_rules_ubuntu22+.rb} | 2 +- .../{efa_ubuntu20+.rb => efa_ubuntu22+.rb} | 2 +- .../{efs_ubuntu20+.rb => efs_ubuntu22+.rb} | 2 +- ...tu20+.rb => ephemeral_drives_ubuntu22+.rb} | 2 +- ...ustre_ubuntu20+.rb => lustre_ubuntu22+.rb} | 2 +- ...ntu20+.rb => network_service_ubuntu22+.rb} | 2 +- .../resources/nfs/nfs_ubuntu20.rb | 39 ------------------- .../{raid_ubuntu20+.rb => raid_ubuntu22+.rb} | 2 +- ....rb => system_authentication_ubuntu22+.rb} | 2 +- .../spec/unit/resources/efs_spec.rb | 2 +- .../spec/unit/resources/lustre_setup_spec.rb | 2 +- .../test/controls/cloudwatch_spec.rb | 4 +- .../files/dcv/pcluster_dcv_connect.sh | 2 +- .../resources/arm_pl/arm_pl_ubuntu20.rb | 33 ---------------- ..._ubuntu20+.rb => build_tools_ubuntu22+.rb} | 2 +- ...tes_ubuntu20+.rb => c_states_ubuntu22+.rb} | 2 +- ...hrony_ubuntu20+.rb => chrony_ubuntu22+.rb} | 2 +- .../resources/dcv/dcv_ubuntu20.rb | 29 -------------- ...nroot_ubuntu20+.rb => enroot_ubuntu22+.rb} | 2 +- ...untu20+.rb => fabric_manager_ubuntu22+.rb} | 2 +- ...copy_ubuntu20+.rb => gdrcopy_ubuntu22+.rb} | 2 +- .../install_packages_ubuntu20.rb | 33 ---------------- ...ules_ubuntu20+.rb => modules_ubuntu22+.rb} | 2 +- ..._ubuntu20+.rb => nvidia_dcgm_ubuntu22+.rb} | 2 +- .../nvidia_driver/nvidia_driver_ubuntu20.rb | 23 ----------- ..._ubuntu20+.rb => nvidia_repo_ubuntu22+.rb} | 2 +- ..._ubuntu20+.rb => sticky_bits_ubuntu22+.rb} | 2 +- ...nnel_ubuntu20+.rb => stunnel_ubuntu22+.rb} | 2 +- ..._ubuntu20+.rb => sudo_access_ubuntu22+.rb} | 2 +- .../spec/unit/resources/dcv_spec.rb | 2 +- .../spec/unit/resources/gdrcopy_spec.rb | 1 - .../spec/unit/resources/sudo_access_spec.rb | 2 +- .../test/controls/c_states_spec.rb | 18 ++------- ...type_ubuntu20+.rb => os_type_ubuntu22+.rb} | 2 +- ...buntu20+.rb => package_repos_ubuntu22+.rb} | 2 +- .../spec/spec_helper.rb | 3 +- .../test/libraries/os_properties.rb | 4 -- ...n_ubuntu20+.rb => dns_domain_ubuntu22+.rb} | 2 +- ...tu20+.rb => jwt_dependencies_ubuntu22+.rb} | 2 +- ...{munge_ubuntu20+.rb => munge_ubuntu22+.rb} | 2 +- ...ubuntu20+.rb => mysql_client_ubuntu22+.rb} | 2 +- ...20+.rb => slurm_dependencies_ubuntu22+.rb} | 2 +- .../test/controls/mysql_client_spec.rb | 2 +- kitchen.docker.yml | 8 ---- kitchen.ec2.sh | 2 +- kitchen.ec2.yml | 26 ------------- test/environments/kitchen.rb | 4 -- 50 files changed, 45 insertions(+), 254 deletions(-) rename cookbooks/aws-parallelcluster-environment/resources/cloudwatch/{cloudwatch_ubuntu20+.rb => cloudwatch_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/{ec2_udev_rules_ubuntu20+.rb => ec2_udev_rules_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-environment/resources/efa/{efa_ubuntu20+.rb => efa_ubuntu22+.rb} (96%) rename cookbooks/aws-parallelcluster-environment/resources/efs/{efs_ubuntu20+.rb => efs_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/{ephemeral_drives_ubuntu20+.rb => ephemeral_drives_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-environment/resources/lustre/{lustre_ubuntu20+.rb => lustre_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-environment/resources/network_service/{network_service_ubuntu20+.rb => network_service_ubuntu22+.rb} (95%) delete mode 100644 cookbooks/aws-parallelcluster-environment/resources/nfs/nfs_ubuntu20.rb rename cookbooks/aws-parallelcluster-environment/resources/raid/{raid_ubuntu20+.rb => raid_ubuntu22+.rb} (79%) rename cookbooks/aws-parallelcluster-environment/resources/system_authentication/{system_authentication_ubuntu20+.rb => system_authentication_ubuntu22+.rb} (95%) delete mode 100644 cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu20.rb rename cookbooks/aws-parallelcluster-platform/resources/build_tools/{build_tools_ubuntu20+.rb => build_tools_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-platform/resources/c_states/{c_states_ubuntu20+.rb => c_states_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-platform/resources/chrony/{chrony_ubuntu20+.rb => chrony_ubuntu22+.rb} (95%) delete mode 100644 cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb rename cookbooks/aws-parallelcluster-platform/resources/enroot/{enroot_ubuntu20+.rb => enroot_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-platform/resources/fabric_manager/{fabric_manager_ubuntu20+.rb => fabric_manager_ubuntu22+.rb} (96%) rename cookbooks/aws-parallelcluster-platform/resources/gdrcopy/{gdrcopy_ubuntu20+.rb => gdrcopy_ubuntu22+.rb} (97%) delete mode 100644 cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_ubuntu20.rb rename cookbooks/aws-parallelcluster-platform/resources/modules/{modules_ubuntu20+.rb => modules_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/{nvidia_dcgm_ubuntu20+.rb => nvidia_dcgm_ubuntu22+.rb} (95%) delete mode 100644 cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_ubuntu20.rb rename cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/{nvidia_repo_ubuntu20+.rb => nvidia_repo_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-platform/resources/sticky_bits/{sticky_bits_ubuntu20+.rb => sticky_bits_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-platform/resources/stunnel/{stunnel_ubuntu20+.rb => stunnel_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-platform/resources/sudo_access/{sudo_access_ubuntu20+.rb => sudo_access_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-shared/resources/os_type/{os_type_ubuntu20+.rb => os_type_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-shared/resources/package_repos/{package_repos_ubuntu20+.rb => package_repos_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-slurm/resources/dns_domain/{dns_domain_ubuntu20+.rb => dns_domain_ubuntu22+.rb} (95%) rename cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/{jwt_dependencies_ubuntu20+.rb => jwt_dependencies_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-slurm/resources/munge/{munge_ubuntu20+.rb => munge_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-slurm/resources/mysql_client/{mysql_client_ubuntu20+.rb => mysql_client_ubuntu22+.rb} (94%) rename cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/{slurm_dependencies_ubuntu20+.rb => slurm_dependencies_ubuntu22+.rb} (94%) diff --git a/.github/workflows/dokken-system-tests.yml b/.github/workflows/dokken-system-tests.yml index 97e51b8d10..7a82294b2e 100644 --- a/.github/workflows/dokken-system-tests.yml +++ b/.github/workflows/dokken-system-tests.yml @@ -31,7 +31,6 @@ jobs: os: - alinux2 - alinux-2023 - - ubuntu2004 - ubuntu2204 - ubuntu2404 - rhel8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 609290892a..f4f6c2a60f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ This file is used to list changes made in each version of the AWS ParallelCluste **ENHANCEMENTS** - Remove UnkillableStepTimeout from slurm.conf and let slurm set this value. +**CHANGES** +- Ubuntu 20.04 is no longer supported. + 3.13.0 ------ **ENHANCEMENTS** diff --git a/cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu22+.rb index 21e2ef6dbb..22381a9d39 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu22+.rb @@ -13,7 +13,7 @@ # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. # See the License for the specific language governing permissions and limitations under the License provides :cloudwatch, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_cloudwatch_common' diff --git a/cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu22+.rb index cb3be3ad4e..b72e12f63b 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu22+.rb @@ -13,7 +13,7 @@ # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. # See the License for the specific language governing permissions and limitations under the License provides :ec2_udev_rules, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu22+.rb similarity index 96% rename from cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu22+.rb index 6d6608328a..8ea4f464d5 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu22+.rb @@ -13,7 +13,7 @@ # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. # See the License for the specific language governing permissions and limitations under the License provides :efa, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu22+.rb index e2baa189ee..8b9407a53e 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu22+.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :efs, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_get_package_version_dpkg' diff --git a/cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu22+.rb index 8e573fd2d7..4c5753658d 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :ephemeral_drives, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_ephemeral_drives_common.rb' diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu22+.rb index 6af5ad91f6..7b42cf0b1d 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu22+.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :lustre, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu22+.rb index 5f574f3613..046ce4f5e7 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu22+.rb @@ -13,7 +13,7 @@ # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. # See the License for the specific language governing permissions and limitations under the License provides :network_service, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-environment/resources/nfs/nfs_ubuntu20.rb b/cookbooks/aws-parallelcluster-environment/resources/nfs/nfs_ubuntu20.rb deleted file mode 100644 index a8c54810c2..0000000000 --- a/cookbooks/aws-parallelcluster-environment/resources/nfs/nfs_ubuntu20.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -# -# Copyright:: 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "LICENSE.txt" file accompanying this file. -# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -# See the License for the specific language governing permissions and limitations under the License. - -provides :nfs, platform: 'ubuntu', platform_version: '20.04' - -unified_mode true - -use 'partial/_install_nfs_debian' -use 'partial/_install_nfs4_and_disable' -use 'partial/_configure' - -default_action :setup - -action :setup do - action_install_nfs - action_install_nfs4 - action_disable_start_at_boot -end - -action_class do - def override_server_template - edit_resource(:template, node['nfs']['config']['server_template']) do - source 'nfs/default-nfs-kernel-server.conf.erb' - cookbook 'aws-parallelcluster-environment' - end - end -end diff --git a/cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu22+.rb similarity index 79% rename from cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu22+.rb index d98fb8fef5..83d10ad0aa 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu22+.rb @@ -1,5 +1,5 @@ provides :raid, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_raid_common' diff --git a/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu20+.rb b/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu22+.rb index d196ab3d4f..249ee619f1 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :system_authentication, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_system_authentication_common' diff --git a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb index f1ef2048ef..738999a3eb 100644 --- a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb +++ b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb @@ -79,7 +79,7 @@ def mock_already_installed(package, expected_version, installed) end for_oses([ - %w(ubuntu 20.04), + %w(ubuntu 24.04), %w(ubuntu 22.04), ]) do |platform, version| context "on #{platform}#{version}" do diff --git a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/lustre_setup_spec.rb b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/lustre_setup_spec.rb index deae23af55..2ee4af5dd3 100644 --- a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/lustre_setup_spec.rb +++ b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/lustre_setup_spec.rb @@ -111,7 +111,7 @@ def self.nothing(chef_run) end for_oses([ - %w(ubuntu 20.04), + %w(ubuntu 24.04), ]) do |platform, version| context "on #{platform}#{version}" do cached(:chef_run) do diff --git a/cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb b/cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb index ee35703090..9e8f90a06e 100644 --- a/cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb +++ b/cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb @@ -19,12 +19,12 @@ end describe 'Check the presence of the cloudwatch package gpg key' - # In Ubuntu >20.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root + # In Ubuntu >22.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root is_ubuntu = os_properties.ubuntu? keyring = is_ubuntu && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : '' sudo = os_properties.redhat_on_docker? ? '' : 'sudo' describe bash("#{sudo} gpg --list-keys #{keyring}") do - # Don't check exit status for Ubuntu20 because it returns 2 when executed in the validate phase of a created AMI + # Don't check exit status for Ubuntu22 because it returns 2 when executed in the validate phase of a created AMI # os_properties cannot be used in the describe block level. It can be used within an it{} block its('exit_status') { should eq 0 } unless is_ubuntu its('stdout') { should match /3B789C72/ } diff --git a/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh b/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh index 19693695e4..73f55176a9 100644 --- a/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh +++ b/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh @@ -112,7 +112,7 @@ main() { os=$(< /etc/chef/dna.json jq -r .cluster.base_os) _log "Input parameters: user: ${user}, OS: ${os}, shared_folder_path: ${shared_folder_path}." - if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2004|ubuntu2204|ubuntu2404|rhel8|rocky8|rhel9|rocky9)$ ]]; then + if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2204|ubuntu2404|rhel8|rocky8|rhel9|rocky9)$ ]]; then _fail "OS not supported." fi diff --git a/cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu20.rb b/cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu20.rb deleted file mode 100644 index 743e871968..0000000000 --- a/cookbooks/aws-parallelcluster-platform/resources/arm_pl/arm_pl_ubuntu20.rb +++ /dev/null @@ -1,33 +0,0 @@ -# frozen_string_literal: true - -# Copyright:: 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "LICENSE.txt" file accompanying this file. -# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -# See the License for the specific language governing permissions and limitations under the License. - -provides :arm_pl, platform: 'ubuntu' do |node| - node['platform_version'].to_i == 20 -end - -use 'partial/_arm_pl_common.rb' - -action_class do - def armpl_platform - "Ubuntu-#{node['platform_version']}" - end - - def modulefile_dir - "/usr/share/modules/modulefiles" - end - - def gcc_major_minor_version - '9.3' - end -end diff --git a/cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu22+.rb index c9335522e5..68287e02bc 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :build_tools, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu22+.rb index 8eb33a57a9..9d27a32c5a 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :c_states, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_c_states_common' diff --git a/cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu22+.rb index 3c15760294..2085ae04b9 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :chrony, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_chrony_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb b/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb deleted file mode 100644 index 529e074a25..0000000000 --- a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -# -# Copyright:: 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "LICENSE.txt" file accompanying this file. -# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -# See the License for the specific language governing permissions and limitations under the License -provides :dcv, platform: 'ubuntu' do |node| - node['platform_version'].to_i == 20 -end - -use 'partial/_dcv_common' -use 'partial/_ubuntu_common' - -def dcv_sha256sum - # Ubuntu20 supports DCV on x86 - 'cf63d51a5bb7ac82569d747215c0118a7468a32c753c0b0fa9c1cf47513c0a0c' -end - -def dcv_supported? - !arm_instance? -end diff --git a/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu22+.rb index 9d5a7c828a..91928fef63 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :enroot, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_enroot_common.rb' use 'partial/_enroot_debian.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu22+.rb similarity index 96% rename from cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu22+.rb index e47bec4ecd..a19faad54e 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :fabric_manager, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_fabric_manager_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu22+.rb similarity index 97% rename from cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu22+.rb index dfec1e4fa7..ef51f0e04c 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :gdrcopy, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_gdrcopy_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_ubuntu20.rb b/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_ubuntu20.rb deleted file mode 100644 index 3899bc1145..0000000000 --- a/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_ubuntu20.rb +++ /dev/null @@ -1,33 +0,0 @@ -# frozen_string_literal: true - -# Copyright:: 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "LICENSE.txt" file accompanying this file. -# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -# See the License for the specific language governing permissions and limitations under the License. - -provides :install_packages, platform: 'ubuntu', platform_version: '20.04' -unified_mode true -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 - # iptables needed for IMDS setup - %w(vim ksh tcsh zsh libssl-dev ncurses-dev libpam-dev net-tools libhwloc-dev dkms - tcl-dev automake autoconf libtool librrd-dev libapr1-dev libconfuse-dev - apache2 libboost-dev libdb-dev libncurses5-dev libpam0g-dev libxt-dev - libmotif-dev libxmu-dev libxft-dev man-db python jq - r-base libblas-dev libffi-dev libxml2-dev - libgcrypt20-dev libevent-dev iproute2 python3 python3-pip - libatlas-base-dev libglvnd-dev iptables libcurl4-openssl-dev - coreutils moreutils curl python3-parted environment-modules dos2unix) -end diff --git a/cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu22+.rb index cf111d22ed..3b81af78aa 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :modules, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_modules_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu22+.rb index d7fc683531..9274b54f09 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :nvidia_dcgm, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_nvidia_dcgm_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_ubuntu20.rb b/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_ubuntu20.rb deleted file mode 100644 index 9e71464f99..0000000000 --- a/cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_ubuntu20.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -# Copyright:: 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "LICENSE.txt" file accompanying this file. -# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -# See the License for the specific language governing permissions and limitations under the License. - -provides :nvidia_driver, platform: 'ubuntu' do |node| - node['platform_version'].to_i == 20 -end - -use 'partial/_nvidia_driver_common.rb' - -def rebuild_initramfs? - true -end diff --git a/cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu22+.rb index 245a1c8380..788e19efb7 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :nvidia_repo, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_nvidia_repo_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu22+.rb index 38b1c81ddb..2a43de2641 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :sticky_bits, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu22+.rb index e74aade387..9b716e19a8 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License provides :stunnel, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_common' diff --git a/cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu20+.rb b/cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu22+.rb index a1496ab6d8..275477c782 100644 --- a/cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-platform/resources/sudo_access/sudo_access_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :sudo_access, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_sudo_access_common.rb' diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb index 882c03da6d..2001e607d9 100644 --- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb +++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/dcv_spec.rb @@ -43,7 +43,7 @@ def self.nothing(chef_run) end case "#{platform}#{version}" - when "amazon2023", "ubuntu20.04" + when "amazon2023" it "is false" do expect(resource.dcv_supported?).to eq(false) end diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb index 441e62fd95..be61bcf74a 100644 --- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb +++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb @@ -221,7 +221,6 @@ def self.configure(chef_run) 'rocky8' => 'el8', 'rhel9' => 'el9', 'rocky9' => 'el9', - 'ubuntu20.04' => 'Ubuntu20_04', 'ubuntu22.04' => 'Ubuntu22_04', 'ubuntu24.04' => 'Ubuntu24_04', } diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/sudo_access_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/sudo_access_spec.rb index 4c339ef23d..cf2f519181 100644 --- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/sudo_access_spec.rb +++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/sudo_access_spec.rb @@ -13,7 +13,7 @@ def self.setup(chef_run) describe 'sudo_access:setup' do for_all_oses do |platform, version| context "on #{platform}#{version}" do - cached(:default_user) { 'ubuntu' } + cached(:default_user) { 'ec2-user' } let(:chef_run) do runner(platform: platform, version: version, step_into: ['sudo_access']) do |node| node.override['cluster']['cluster_user'] = default_user diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb index e560019afd..02888d7aa0 100644 --- a/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb +++ b/cookbooks/aws-parallelcluster-platform/test/controls/c_states_spec.rb @@ -2,20 +2,10 @@ control 'tag:install_c_states_kernel_configured' do title 'Check the configuration to disable c states' only_if { !os_properties.on_docker? && os_properties.x86? } - - if os_properties.ubuntu? - %w(/etc/default/grub /boot/grub/grub.cfg).each do |file_path| - describe file(file_path) do - it { should exist } - its('content') { should match(/processor.max_cstate=1/) } - its('content') { should match(/intel_idle.max_cstate=1/) } - end - end - else - describe bash('cpupower idle-info') do - its('stdout') { should match(/Number of idle states: 2/) } - its('stdout') { should match(/Available idle states: POLL C1/) } - end + ## cpupower is installed for Ubuntu >=22 + describe bash('cpupower idle-info') do + its('stdout') { should match(/Number of idle states: 2/) } + its('stdout') { should match(/Available idle states: POLL C1/) } end end diff --git a/cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu20+.rb b/cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu22+.rb index 2058fdaae6..75343062b6 100644 --- a/cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-shared/resources/os_type/os_type_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :os_type, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_os_type_common.rb' diff --git a/cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu20+.rb b/cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu22+.rb index 3834a3a0b6..b3b887d312 100644 --- a/cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-shared/resources/package_repos/package_repos_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :package_repos, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end unified_mode true diff --git a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb index 27993e0270..70045f0360 100644 --- a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb +++ b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb @@ -13,7 +13,7 @@ end # This will be used by default when platform doesn't matter # When it matters, platform value must be overridden for a specific test - c.platform = 'ubuntu' + c.platform = 'redhat' end module ChefSpec @@ -41,7 +41,6 @@ def for_all_oses [ %w(amazon 2), %w(amazon 2023), - %w(ubuntu 20.04), %w(ubuntu 22.04), %w(ubuntu 24.04), %w(redhat 8), diff --git a/cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb b/cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb index 719e5bea3f..768d5c9a98 100644 --- a/cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb +++ b/cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb @@ -64,10 +64,6 @@ def alinux2023_on_docker? on_docker? && alinux2023? end - def ubuntu2004? - inspec.os.name == 'ubuntu' && inspec.os.release == '20.04' - end - def ubuntu2204? inspec.os.name == 'ubuntu' && inspec.os.release == '22.04' end diff --git a/cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu20+.rb b/cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu22+.rb similarity index 95% rename from cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu22+.rb index a16eda9f19..6451fba4a3 100644 --- a/cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-slurm/resources/dns_domain/dns_domain_ubuntu22+.rb @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :dns_domain, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_dns_domain_common' diff --git a/cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu20+.rb b/cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu22+.rb index 2790e7bff4..bc88412c99 100644 --- a/cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-slurm/resources/jwt_dependencies/jwt_dependencies_ubuntu22+.rb @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :jwt_dependencies, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_jwt_dependencies_common' diff --git a/cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu20+.rb b/cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu22+.rb index 335e966a67..b46cf8af9b 100644 --- a/cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-slurm/resources/munge/munge_ubuntu22+.rb @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :munge, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_munge_actions' diff --git a/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu20+.rb b/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu22+.rb index 13426cd0dc..772cafa9ad 100644 --- a/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-slurm/resources/mysql_client/mysql_client_ubuntu22+.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :mysql_client, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_common' diff --git a/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu20+.rb b/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu22+.rb similarity index 94% rename from cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu20+.rb rename to cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu22+.rb index be48a60214..357be09fa1 100644 --- a/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu20+.rb +++ b/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_ubuntu22+.rb @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and limitations under the License. provides :slurm_dependencies, platform: 'ubuntu' do |node| - node['platform_version'].to_i >= 20 + node['platform_version'].to_i >= 22 end use 'partial/_slurm_dependencies_common' diff --git a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb index bd50750ec8..42a6c4f11a 100644 --- a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb +++ b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb @@ -17,7 +17,7 @@ if os.redhat? mysql_packages.concat %w(mysql-community-client-plugins mysql-community-common mysql-community-devel mysql-community-libs) - if os_properties.alinux2? || os_properties.centos7? + if os_properties.alinux2? mysql_packages.concat %w(mysql-community-libs-compat) end elsif ubuntu diff --git a/kitchen.docker.yml b/kitchen.docker.yml index 2e3580f1ec..9156a702b0 100644 --- a/kitchen.docker.yml +++ b/kitchen.docker.yml @@ -44,14 +44,6 @@ platforms: attributes: cluster: base_os: alinux2023 - - name: ubuntu2004 - driver: - image: <% if ENV['KITCHEN_UBUNTU2004_IMAGE'] %> <%= ENV['KITCHEN_UBUNTU2004_IMAGE'] %> <% else %> dokken/ubuntu-20.04 <% end %> - attributes: - cluster: - base_os: ubuntu2004 - # Since the kernel version of the docker images is not compatible (6.2.0-1016-azure), set a fake kernel value to permit to install Lustre on docker. - kernel_release: '5.15.0-1028-aws' - name: ubuntu2204 driver: image: <% if ENV['KITCHEN_UBUNTU2204_IMAGE'] %> <%= ENV['KITCHEN_UBUNTU2204_IMAGE'] %> <% else %> dokken/ubuntu-22.04 <% end %> diff --git a/kitchen.ec2.sh b/kitchen.ec2.sh index ae94d8758c..c4bb703d13 100755 --- a/kitchen.ec2.sh +++ b/kitchen.ec2.sh @@ -41,7 +41,7 @@ # KITCHEN_CENTOS7_AMI: specific AMI to use for centos7 # if not specified, will look for the latest suitable ParallelCluster AMI # -# KITCHEN_UBUNTU2004_AMI: specific AMI to use for ubuntu20.04 +# KITCHEN_UBUNTU2404_AMI: specific AMI to use for ubuntu24.04 # if not specified, will look for the latest suitable ParallelCluster AMI # # KITCHEN_UBUNTU2204_AMI: specific AMI to use for ubuntu22.04 diff --git a/kitchen.ec2.yml b/kitchen.ec2.yml index 3376f0e59f..8cf39fb0dc 100644 --- a/kitchen.ec2.yml +++ b/kitchen.ec2.yml @@ -237,32 +237,6 @@ platforms: attributes: cluster: base_os: rocky9 - - name: ubuntu2004 - driver_plugin: ec2 - driver: - <% if ENV['KITCHEN_UBUNTU2004_AMI'] %> - # Use the Ubuntu 20 AMI most similar to the base AMI used to build the ParallelCluster image - image_id: <%= ENV['KITCHEN_UBUNTU2004_AMI'] %> - <% else %> - image_search: - name: <% if ENV['KITCHEN_PHASE']=='install' %>ubuntu/images/hvm-ssd/ubuntu-focal-20.04-<% if ENV['KITCHEN_ARCHITECTURE'] == 'x86_64' %>amd64<% else %>arm64<% end %>-server-<% else %><%= pcluster_prefix %>-ubuntu-2004-lts-hvm-*<% end %> - architecture: <%= ENV['KITCHEN_ARCHITECTURE'] %> - <% end %> - block_device_mappings: - - device_name: /dev/sda1 - ebs: - volume_size: <% if (ENV['KITCHEN_VOLUME_SIZE'] || '') == '' %> 45 <% else %> <%= ENV['KITCHEN_VOLUME_SIZE'] %> <% end %> - volume_type: gp2 - delete_on_termination: true - <% %w(a b c d e f g h i j k l m n o p q r s t u v w x).each_with_index do | c, i | %> - - device_name: /dev/xvdb<%= c %> - virtual_name: ephemeral<%= i %> - <% end %> - transport: - username: ubuntu - attributes: - cluster: - base_os: ubuntu2004 - name: ubuntu2204 driver_plugin: ec2 driver: diff --git a/test/environments/kitchen.rb b/test/environments/kitchen.rb index d8702b5cdf..9545ed0153 100644 --- a/test/environments/kitchen.rb +++ b/test/environments/kitchen.rb @@ -8,7 +8,6 @@ 'ebs_mount-vol_array/alinux2023' => '', 'ebs_mount-vol_array/rhel8' => '', 'ebs_mount-vol_array/rhel9' => '', - 'ebs_mount-vol_array/ubuntu2004' => '', 'ebs_mount-vol_array/ubuntu2204' => '', 'ebs_mount-vol_array/ubuntu2404' => '', 'ebs_mount-vol_array/rocky8' => '', @@ -17,7 +16,6 @@ 'ebs_unmount-vol_array/alinux2023' => '', 'ebs_unmount-vol_array/rhel8' => '', 'ebs_unmount-vol_array/rhel9' => '', - 'ebs_unmount-vol_array/ubuntu2004' => '', 'ebs_unmount-vol_array/ubuntu2204' => '', 'ebs_unmount-vol_array/ubuntu2404' => '', 'ebs_unmount-vol_array/rocky8' => '', @@ -26,7 +24,6 @@ 'raid_mount-raid_vol_array/alinux2023' => '', 'raid_mount-raid_vol_array/rhel8' => '', 'raid_mount-raid_vol_array/rhel9' => '', - 'raid_mount-raid_vol_array/ubuntu2004' => '', 'raid_mount-raid_vol_array/ubuntu2204' => '', 'raid_mount-raid_vol_array/ubuntu2404' => '', 'raid_mount-raid_vol_array/rocky8' => '', @@ -35,7 +32,6 @@ 'raid_unmount-raid_vol_array/alinux2023' => '', 'raid_unmount-raid_vol_array/rhel8' => '', 'raid_unmount-raid_vol_array/rhel9' => '', - 'raid_unmount-raid_vol_array/ubuntu2004' => '', 'raid_unmount-raid_vol_array/ubuntu2204' => '', 'raid_unmount-raid_vol_array/ubuntu2404' => '', 'raid_unmount-raid_vol_array/rocky8' => '',