Skip to content

Commit 41ccbd9

Browse files
committed
Add support for Ubuntu24
1 parent 5c27c28 commit 41ccbd9

File tree

8 files changed

+26
-9
lines changed

8 files changed

+26
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CHANGELOG
33
3.13.0
44
------
55
**ENHANCEMENTS**
6+
- Add support Ubuntu2404
67

78
**CHANGES**
89

cli/src/pcluster/config/cluster_config.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
DefaultUserHomeType,
3333
)
3434
from pcluster.config.common import Imds as TopLevelImds
35-
from pcluster.config.common import (
36-
Resource,
37-
)
35+
from pcluster.config.common import Resource
3836
from pcluster.constants import (
3937
CIDR_ALL_IPS,
4038
CW_ALARMS_ENABLED_DEFAULT,

cli/src/pcluster/constants.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,17 @@
2323

2424
SUPPORTED_SCHEDULERS = ["slurm", "awsbatch"]
2525
SCHEDULERS_SUPPORTING_IMDS_SECURED = ["slurm"]
26-
SUPPORTED_OSES = ["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]
26+
SUPPORTED_OSES = [
27+
"alinux2",
28+
"alinux2023",
29+
"ubuntu2004",
30+
"ubuntu2204",
31+
"ubuntu2404",
32+
"rhel8",
33+
"rocky8",
34+
"rhel9",
35+
"rocky9",
36+
]
2737
SUPPORTED_OSES_FOR_SCHEDULER = {"slurm": SUPPORTED_OSES, "awsbatch": ["alinux2", "alinux2023"]}
2838
UNSUPPORTED_OSES_FOR_MICRO_NANO = ["ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]
2939
UNSUPPORTED_OSES_FOR_DCV = ["alinux2023"]

cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ phases:
9090
OS='ubuntu2004'
9191
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.22'` ]; then
9292
OS='ubuntu2204'
93+
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.24'` ]; then
94+
OS='ubuntu2404'
9395
elif [ `echo "${!RELEASE}" | grep '^rhel\.8'` ]; then
9496
OS='rhel8'
9597
elif [ `echo "${!RELEASE}" | grep '^rocky\.8'` ]; then
@@ -175,7 +177,7 @@ phases:
175177
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu2004, Ubuntu2204, RHEL8, Rocky8, RHEL9 and Rocky9
176178
ARCH=$(uname -m)
177179
if [[ `echo ${!ARCH}` == 'aarch64' ]]; then
178-
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|amzn\.2023|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8|rocky\.8|rhel\.9|rocky\.9)'` ]; then
180+
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|amzn\.2023|ubuntu\.20\.04|ubuntu\.22\.04|ubuntu\.24\.04|rhel\.8|rocky\.8|rhel\.9|rocky\.9)'` ]; then
179181
echo "This component does not support '${!RELEASE}' on ARM64 CPUs. Failing build."
180182
exit {{ FailExitCode }}
181183
fi

cli/src/pcluster/resources/imagebuilder/parallelcluster_test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ phases:
4242
OS='ubuntu2004'
4343
elif [ `echo "${RELEASE}" | grep '^ubuntu\.22'` ]; then
4444
OS='ubuntu2204'
45+
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.24'` ]; then
46+
OS='ubuntu2404'
4547
elif [ `echo "${RELEASE}" | grep '^rhel\.8'` ]; then
4648
OS='rhel8'
4749
elif [ `echo "${RELEASE}" | grep '^rocky\.8'` ]; then

cli/src/pcluster/resources/imagebuilder/parallelcluster_validate.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ phases:
4242
OS='ubuntu2004'
4343
elif [ `echo "${RELEASE}" | grep '^ubuntu\.22'` ]; then
4444
OS='ubuntu2204'
45+
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.24'` ]; then
46+
OS='ubuntu2404'
4547
elif [ `echo "${RELEASE}" | grep '^rhel\.8'` ]; then
4648
OS='rhel8'
4749
elif [ `echo "${RELEASE}" | grep '^rocky\.8'` ]; then

cli/src/pcluster/resources/imagebuilder/update_and_reboot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ phases:
4343
OS='ubuntu2004'
4444
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.22'` ]; then
4545
OS='ubuntu2204'
46+
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.24'` ]; then
47+
OS='ubuntu2404'
4648
elif [ `echo "${!RELEASE}" | grep '^rhel\.8'` ]; then
4749
OS='rhel8'
4850
elif [ `echo "${!RELEASE}" | grep '^rocky\.8'` ]; then
@@ -91,7 +93,7 @@ phases:
9193
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu2004, Ubuntu2204, RHEL8, Rocky8, RHEL9 and Rocky9
9294
ARCH=$(uname -m)
9395
if [[ `echo ${!ARCH}` == 'aarch64' ]]; then
94-
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8|rocky\.8|rhel\.9|rocky\.9)'` ]; then
96+
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|ubuntu\.20\.04|ubuntu\.22\.04|ubuntu\.24\.04|rhel\.8|rocky\.8|rhel\.9|rocky\.9)'` ]; then
9597
echo "This component does not support '${!RELEASE}' on ARM64 CPUs. Failing build."
9698
exit {{ FailExitCode }}
9799
fi

cli/tests/pcluster/test_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ def test_generate_random_prefix():
8888
[
8989
(
9090
"x86_64",
91-
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
91+
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "ubuntu2404", "rhel8", "rocky8", "rhel9", "rocky9"],
9292
),
9393
(
9494
"arm64",
95-
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
95+
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "ubuntu2404", "rhel8", "rocky8", "rhel9", "rocky9"],
9696
),
9797
],
9898
)
@@ -108,7 +108,7 @@ def test_get_supported_os_for_architecture(architecture, supported_oses):
108108
[
109109
(
110110
"slurm",
111-
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"],
111+
["alinux2", "alinux2023", "ubuntu2004", "ubuntu2204", "ubuntu2404", "rhel8", "rocky8", "rhel9", "rocky9"],
112112
),
113113
("awsbatch", ["alinux2", "alinux2023"]),
114114
],

0 commit comments

Comments
 (0)