Skip to content

Fix delete keypair issue #5369

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
sallyseok merged 4 commits into from
Oct 14, 2025
Merged

Fix delete keypair issue #5369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d262cb
Fix delete keypair issue
sallyseok Oct 13, 2025
46c3f70
fix; only test ec2
sallyseok Oct 14, 2025
8c9c51b
revert temp changes
sallyseok Oct 14, 2025
c82a2b1
Merge branch 'master' into fix-delete-keypair
sallyseok Oct 14, 2025
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
4 changes: 2 additions & 2 deletions pytorch/training/buildspec-2-6-sm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ images:
os_version: &OS_VERSION ubuntu22.04
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
# skip_build: "False"
# skip_build: "True"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
target: sagemaker
context:
Expand All @@ -64,7 +64,7 @@ images:
os_version: &OS_VERSION ubuntu22.04
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
# skip_build: "False"
# skip_build: "True"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile.,
*DEVICE_TYPE ]
target: sagemaker
Expand Down
14 changes: 10 additions & 4 deletions test/test_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,11 +1273,17 @@ def generate_ssh_keypair(ec2_client, key_name):
return key_filename


def destroy_ssh_keypair(ec2_client, key_filename):
key_name = os.path.basename(key_filename).split(".pem")[0]
def destroy_ssh_keypair(ec2_client, key_file):
if not key_file.endswith(".pem"):
LOGGER.error(f"Invalid key pair file name {key_file}. Unable to delete")
return
run(f"rm -f {key_file}")
key_name = os.path.basename(key_file).split(".pem")[0]
response = ec2_client.delete_key_pair(KeyName=key_name)
run(f"rm -f {key_filename}")
return response, key_name
if response["Return"] == True:
LOGGER.info(f"Deleted key pair {key_name}")
else:
LOGGER.error(f"Failed to delete key pair {key_name}")


def upload_tests_to_s3(testname_datetime_suffix):
Expand Down
20 changes: 8 additions & 12 deletions test/testrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,22 +258,18 @@ def setup_sm_benchmark_env(dlc_images, test_path):
setup_sm_benchmark_mx_train_env(resources_location)


def delete_key_pairs(keyfile):
def delete_key_pairs(keys_to_delete_file):
"""
Function to delete key pairs from a file in mainline context

:param keyfile: file with all of the keys to delete
:param keys_to_delete_file: file with all of the keys to delete
"""
try:
with open(keyfile) as key_destroy_file:
for key_file in key_destroy_file:
LOGGER.info(f"destroying {key_file} listed in {key_destroy_file}")
ec2_client = boto3.client("ec2", config=Config(retries={"max_attempts": 10}))
if ".pem" in key_file:
_resp, keyname = destroy_ssh_keypair(ec2_client, key_file)
LOGGER.info(f"Deleted {keyname}")
except Exception as e:
LOGGER.error(f"Failed to delete key pair with exception: {e}")
ec2_client = boto3.client("ec2", config=Config(retries={"max_attempts": 10}))
with open(keys_to_delete_file) as f:
for key_file in f:
key_file = key_file.strip()
LOGGER.info(f"Destroying {key_file} listed in {keys_to_delete_file}")
destroy_ssh_keypair(ec2_client, key_file)


def build_bai_docker_container():
Expand Down