Skip to content

[Ubuntu24] Add Ubuntu24 for other validators #6757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2025
Merged

[Ubuntu24] Add Ubuntu24 for other validators #6757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/pcluster/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"rocky9",
]
SUPPORTED_OSES_FOR_SCHEDULER = {"slurm": SUPPORTED_OSES, "awsbatch": ["alinux2", "alinux2023"]}
UNSUPPORTED_OSES_FOR_MICRO_NANO = ["ubuntu2004", "ubuntu2204", "rhel8", "rocky8", "rhel9", "rocky9"]
UNSUPPORTED_OSES_FOR_MICRO_NANO = ["ubuntu2004", "ubuntu2204", "ubuntu2404", "rhel8", "rocky8", "rhel9", "rocky9"]
UNSUPPORTED_OSES_FOR_DCV = ["alinux2023"]
UNSUPPORTED_ARM_OSES_FOR_DCV = ["ubuntu2004"]
UNSUPPORTED_OSES_FOR_LUSTRE = ["ubuntu2404"]
Expand Down
4 changes: 2 additions & 2 deletions cli/src/pcluster/validators/ec2_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ def _validate(self, key_name: str, os: str):
if key_name:
try:
key_pair = KeyPairInfo(key_name)
if os == "ubuntu2204" and key_pair.key_type == "rsa":
if os in ["ubuntu2204", "ubuntu2404"] and key_pair.key_type == "rsa":
self._add_failure(
"Ubuntu 22.04 does not support RSA keys. Please generate and use an ed25519 key",
f"{os} does not support RSA keys. Please generate and use an ed25519 key",
FailureLevel.ERROR,
)
except AWSClientError as e:
Expand Down
2 changes: 2 additions & 0 deletions cli/tests/pcluster/validators/test_cluster_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3509,6 +3509,7 @@ def test_multi_network_interfaces_instances_validator(
("ami-000000000000", "rhel8", None, None),
("ami-000000000000", "ubuntu22", None, None),
("ami-000000000000", "ubuntu20", None, None),
("ami-000000000000", "ubuntu24", None, None),
(
None,
"rocky8",
Expand All @@ -3522,6 +3523,7 @@ def test_multi_network_interfaces_instances_validator(
(None, "rhel8", None, None),
(None, "ubuntu22", None, None),
(None, "ubuntu20", None, None),
(None, "ubuntu24", None, None),
],
)
def test_compute_ami_os_compatible_validator(mocker, custom_ami_id, os, expected_message, expected_failure_level):
Expand Down
3 changes: 2 additions & 1 deletion cli/tests/pcluster/validators/test_ec2_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,8 @@ def test_instance_type_os_compatible_validator(instance_type, os, expected_messa
"does not exist",
),
("key-name", GoodKeyPairsDict, "ubuntu2204", None, None),
("key-name", BadKeyPairsDict, "ubuntu2204", None, "Ubuntu 22.04 does not support RSA keys"),
("key-name", BadKeyPairsDict, "ubuntu2204", None, "ubuntu2204 does not support RSA keys"),
("key-name", BadKeyPairsDict, "ubuntu2404", None, "ubuntu2404 does not support RSA keys"),
("key-name", GoodKeyPairsDict, "ubuntu2004", None, None),
("key-name", BadKeyPairsDict, "ubuntu2004", None, None),
("key-name", GoodKeyPairsDict, "rhel8", None, None),
Expand Down
Loading