Skip to content

Commit 61911ca

Browse files
committed
Support DCV on Alinux2023
1 parent 0aad74f commit 61911ca

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

cli/src/pcluster/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
]
3636
SUPPORTED_OSES_FOR_SCHEDULER = {"slurm": SUPPORTED_OSES, "awsbatch": ["alinux2", "alinux2023"]}
3737
UNSUPPORTED_OSES_FOR_MICRO_NANO = ["ubuntu2204", "ubuntu2404", "rhel8", "rocky8", "rhel9", "rocky9"]
38-
UNSUPPORTED_OSES_FOR_DCV = ["alinux2023"]
38+
UNSUPPORTED_OSES_FOR_DCV = []
3939
UNSUPPORTED_ARM_OSES_FOR_DCV = []
4040
UNSUPPORTED_OSES_FOR_LUSTRE = []
4141
DELETE_POLICY = "Delete"

tests/integration-tests/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
REPOSITORY_ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..")
1919

20-
UNSUPPORTED_OSES_FOR_DCV = ["alinux2023"]
20+
UNSUPPORTED_OSES_FOR_DCV = []
2121

2222

2323
class NodeType(Enum):

tests/integration-tests/tests/dcv/test_dcv.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
import logging
1313
import os as operating_system
1414
import re
15+
import subprocess
1516

1617
import pytest
1718
import requests
1819
from assertpy import assert_that
20+
1921
from framework.credential_providers import run_pcluster_command
2022
from remote_command_executor import RemoteCommandExecutionError, RemoteCommandExecutor
2123
from utils import (
@@ -165,7 +167,14 @@ def _test_show_url(cluster, region, dcv_port, access_from, use_login_node=False)
165167

166168
# add ssh key to jenkins user known hosts file to avoid ssh keychecking prompt
167169
host_keys_file = operating_system.path.expanduser("~/.ssh/known_hosts")
170+
logging.info(f"Add ip address {node_ip} to known hosts file {host_keys_file}")
171+
172+
result = subprocess.check_output("cat {0}".format(host_keys_file), shell=True)
173+
logging.info(f"Original content of known hosts file {host_keys_file}: {result}")
174+
168175
add_keys_to_known_hosts(node_ip, host_keys_file)
176+
result = subprocess.check_output("cat {0}".format(host_keys_file), shell=True)
177+
logging.info(f"New content of known hosts file {host_keys_file}: {result}")
169178

170179
dcv_connect_args = ["pcluster", "dcv-connect", "--cluster-name", cluster.name, "--show-url"]
171180

tests/integration-tests/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def get_username_for_os(os):
545545

546546
def add_keys_to_known_hosts(hostname, host_keys_file):
547547
"""Add ssh key for a host to a known_hosts file."""
548-
os.system("ssh-keyscan -t rsa {0} >> {1}".format(hostname, host_keys_file))
548+
os.system("ssh-keyscan -t ed25519 {0} >> {1}".format(hostname, host_keys_file))
549549

550550

551551
def remove_keys_from_known_hosts(hostname, host_keys_file, env):

0 commit comments

Comments
 (0)