Skip to content

Commit dacc9cf

Browse files
Himani Anil Deshpandehimani2411
Himani Anil Deshpande
authored andcommitted
Deprecate support for Ubuntu 20.04
1 parent 2f46ec1 commit dacc9cf

File tree

50 files changed

+45
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+45
-254
lines changed

.github/workflows/dokken-system-tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
os:
3232
- alinux2
3333
- alinux-2023
34-
- ubuntu2004
3534
- ubuntu2204
3635
- ubuntu2404
3736
- rhel8

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ This file is used to list changes made in each version of the AWS ParallelCluste
99
**ENHANCEMENTS**
1010
- Remove UnkillableStepTimeout from slurm.conf and let slurm set this value.
1111

12+
**CHANGES**
13+
- Ubuntu 20.04 is no longer supported.
14+
1215
3.13.0
1316
------
1417
**ENHANCEMENTS**

cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/cloudwatch/cloudwatch_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License
1515
provides :cloudwatch, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_cloudwatch_common'

cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/ec2_udev_rules/ec2_udev_rules_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License
1515
provides :ec2_udev_rules, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
unified_mode true

cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/efa/efa_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License
1515
provides :efa, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
unified_mode true

cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/efs/efs_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and limitations under the License.
1515

1616
provides :efs, platform: 'ubuntu' do |node|
17-
node['platform_version'].to_i >= 20
17+
node['platform_version'].to_i >= 22
1818
end
1919

2020
use 'partial/_get_package_version_dpkg'

cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/ephemeral_drives/ephemeral_drives_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :ephemeral_drives, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_ephemeral_drives_common.rb'

cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and limitations under the License.
1515

1616
provides :lustre, platform: 'ubuntu' do |node|
17-
node['platform_version'].to_i >= 20
17+
node['platform_version'].to_i >= 22
1818
end
1919

2020
unified_mode true

cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/network_service/network_service_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License
1515
provides :network_service, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
unified_mode true

cookbooks/aws-parallelcluster-environment/resources/nfs/nfs_ubuntu20.rb

-39
This file was deleted.

cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/raid/raid_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
provides :raid, platform: 'ubuntu' do |node|
2-
node['platform_version'].to_i >= 20
2+
node['platform_version'].to_i >= 22
33
end
44

55
use 'partial/_raid_common'

cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu20+.rb cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :system_authentication, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_system_authentication_common'

cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def mock_already_installed(package, expected_version, installed)
7979
end
8080

8181
for_oses([
82-
%w(ubuntu 20.04),
82+
%w(ubuntu 24.04),
8383
%w(ubuntu 22.04),
8484
]) do |platform, version|
8585
context "on #{platform}#{version}" do

cookbooks/aws-parallelcluster-environment/spec/unit/resources/lustre_setup_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def self.nothing(chef_run)
111111
end
112112

113113
for_oses([
114-
%w(ubuntu 20.04),
114+
%w(ubuntu 24.04),
115115
]) do |platform, version|
116116
context "on #{platform}#{version}" do
117117
cached(:chef_run) do

cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
end
2020

2121
describe 'Check the presence of the cloudwatch package gpg key'
22-
# In Ubuntu >20.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root
22+
# In Ubuntu >22.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root
2323
is_ubuntu = os_properties.ubuntu?
2424
keyring = is_ubuntu && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : ''
2525
sudo = os_properties.redhat_on_docker? ? '' : 'sudo'
2626
describe bash("#{sudo} gpg --list-keys #{keyring}") do
27-
# Don't check exit status for Ubuntu20 because it returns 2 when executed in the validate phase of a created AMI
27+
# Don't check exit status for Ubuntu22 because it returns 2 when executed in the validate phase of a created AMI
2828
# os_properties cannot be used in the describe block level. It can be used within an it{} block
2929
its('exit_status') { should eq 0 } unless is_ubuntu
3030
its('stdout') { should match /3B789C72/ }

cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ main() {
112112
os=$(< /etc/chef/dna.json jq -r .cluster.base_os)
113113
_log "Input parameters: user: ${user}, OS: ${os}, shared_folder_path: ${shared_folder_path}."
114114

115-
if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2004|ubuntu2204|ubuntu2404|rhel8|rocky8|rhel9|rocky9)$ ]]; then
115+
if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2204|ubuntu2404|rhel8|rocky8|rhel9|rocky9)$ ]]; then
116116
_fail "OS not supported."
117117
fi
118118

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

-33
This file was deleted.

cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/build_tools/build_tools_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :build_tools, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
unified_mode true

cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/c_states/c_states_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :c_states, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_c_states_common'

cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/chrony/chrony_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :chrony, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_chrony_common.rb'

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb

-29
This file was deleted.

cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :enroot, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818
use 'partial/_enroot_common.rb'
1919
use 'partial/_enroot_debian.rb'

cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/fabric_manager/fabric_manager_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :fabric_manager, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_fabric_manager_common.rb'

cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/gdrcopy/gdrcopy_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :gdrcopy, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_gdrcopy_common.rb'

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

-33
This file was deleted.

cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/modules/modules_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :modules, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_modules_common.rb'

cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/nvidia_dcgm_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :nvidia_dcgm, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_nvidia_dcgm_common.rb'

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

-23
This file was deleted.

cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/nvidia_repo/nvidia_repo_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :nvidia_repo, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_nvidia_repo_common.rb'

cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/sticky_bits/sticky_bits_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License.
1414

1515
provides :sticky_bits, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
unified_mode true

cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu20+.rb cookbooks/aws-parallelcluster-platform/resources/stunnel/stunnel_ubuntu22+.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and limitations under the License
1414

1515
provides :stunnel, platform: 'ubuntu' do |node|
16-
node['platform_version'].to_i >= 20
16+
node['platform_version'].to_i >= 22
1717
end
1818

1919
use 'partial/_common'

0 commit comments

Comments
 (0)