fix: aws_batch integ test resources are now uniquely named by test run.#5666

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
mollyheamazon merged 1 commit into from
Mar 25, 2026
Merged

fix: aws_batch integ test resources are now uniquely named by test run. #5666

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
76 changes: 22 additions & 54 deletions sagemaker-train/tests/integ/train/aws_batch/manager.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
def __init__(
self,
batch_client,
test_id,
queue_name="pysdk-test-qm-queue",
service_env_name="pysdk-test-qm-queue-service-environment",
scheduling_policy_name="pysdk-test-qm-scheduling-policy",
quota_share_name="pysdk-test-quota-share",
):
self.test_id = test_id
self.batch_client = batch_client
self.queue_name = queue_name
self.service_environment_name = service_env_name
self.scheduling_policy_name = scheduling_policy_name
self.quota_share_name = quota_share_name
self.queue_name = f"{queue_name}-{test_id}"
self.service_environment_name = f"{service_env_name}-{test_id}"
self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
self.quota_share_name = f"{quota_share_name}-{test_id}"

def _create_or_get_service_environment(self, service_environment_name):
print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
print("Waiting for QuotaShare deletion to finish...")
self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

def get_or_create_resources(
self,
queue_name=None,
service_environment_name=None,
scheduling_policy_name=None,
quota_share_name=None
):
queue_name = queue_name or self.queue_name
service_environment_name = service_environment_name or self.service_environment_name
scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
quota_share_name = quota_share_name or self.quota_share_name

service_environment = self._create_or_get_service_environment(service_environment_name)
if service_environment.get("state") != "ENABLED":
self._update_service_environment_state(service_environment_name, "ENABLED")
self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
time.sleep(10)

scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
scheduling_policy_arn = scheduling_policy.get("arn")

queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
scheduling_policy_arn)
if queue.get("state") != "ENABLED":
self._update_queue_state(queue_name, "ENABLED")
self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
time.sleep(10)

quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
if quota_share.get("state") != "ENABLED":
self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
time.sleep(10)
def get_or_create_resources(self):
service_environment = self._create_or_get_service_environment(self.service_environment_name)
scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

return queue, service_environment, scheduling_policy, quota_share
queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
scheduling_policy.get("arn"))
self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

def delete_resources(
self,
queue_name=None,
service_environment_name=None,
scheduling_policy_name=None,
quota_share_name=None
):
queue_name = queue_name or self.queue_name
service_environment_name = service_environment_name or self.service_environment_name
scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
quota_share_name = quota_share_name or self.quota_share_name
quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

return queue, service_environment, scheduling_policy, quota_share

def delete_resources(self):
# Get ARNs needed for deletion
desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
if desc_jq["jobQueues"]:
jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
self._delete_quota_share(quota_share_arn)

self._delete_job_queue(queue_name)
self._delete_job_queue(self.queue_name)

sp = self._find_scheduling_policy(scheduling_policy_name)
sp = self._find_scheduling_policy(self.scheduling_policy_name)
if sp:
self._delete_scheduling_policy(sp["arn"])

self._delete_service_environment(service_environment_name)
self._delete_service_environment(self.service_environment_name)
26 changes: 23 additions & 3 deletions sagemaker-train/tests/integ/train/aws_batch/test_queue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
ALPHABET = string.ascii_lowercase + string.digits
DEFAULT_LENGTH = 8

@staticmethod
def get(length=DEFAULT_LENGTH):
return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
resource_manager = BatchTestResourceManager(batch_client=batch_client)
resource_manager.get_or_create_resources()
yield resource_manager
# Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
test_id = ShortId.get()
print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

try:
resource_manager.get_or_create_resources()
yield resource_manager
except Exception as e:
print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here
add raise

@davlind-amzndavlind-amznMar 25, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception

resource_manager.delete_resources()


Expand Down
2 changes: 1 addition & 1 deletion v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
"metadata": {},
"source": [
"## Create TrainingQueue object\n",
"Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
"Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
jobQueues=[create_qs_request["jobQueue"]]
)
jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
return {
"quotaShareName": create_qs_request["quotaShareName"],
"quotaShareArn": quota_share_arn,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: aws_batch integ test resources are now uniquely named by test run.#5666

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

mollyheamazon
merged 1 commit into

from

Mar 25, 2026
 Merged


fix: aws_batch integ test resources are now uniquely named by test run.
#5666
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


76 changes: 22 additions & 54 deletions
sagemaker-train/tests/integ/train/aws_batch/manager.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,16 +21,18 @@ class BatchTestResourceManager:
 def __init__(
 self,
 batch_client,
 test_id,
 queue_name="pysdk-test-qm-queue",
 service_env_name="pysdk-test-qm-queue-service-environment",
 scheduling_policy_name="pysdk-test-qm-scheduling-policy",
 quota_share_name="pysdk-test-quota-share",
 ):
 self.test_id = test_id
 self.batch_client = batch_client
 self.queue_name = queue_name
 self.service_environment_name = service_env_name
 self.scheduling_policy_name = scheduling_policy_name
 self.quota_share_name = quota_share_name
 self.queue_name = f"{queue_name}-{test_id}"
 self.service_environment_name = f"{service_env_name}-{test_id}"
 self.scheduling_policy_name = f"{scheduling_policy_name}-{test_id}"
 self.quota_share_name = f"{quota_share_name}-{test_id}"

 def _create_or_get_service_environment(self, service_environment_name):
 print(f"Creating service environment: {service_environment_name}")
Expand DownExpand Up@@ -277,65 +279,31 @@ def _delete_quota_share(self, quota_share_arn: str):
 print("Waiting for QuotaShare deletion to finish...")
 self._wait_for_quota_share_state(quota_share_arn, "DELETED", "DISABLED")

 def get_or_create_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name

 service_environment = self._create_or_get_service_environment(service_environment_name)
 if service_environment.get("state") != "ENABLED":
 self._update_service_environment_state(service_environment_name, "ENABLED")
 self._wait_for_service_environment_state(service_environment_name, "VALID", "ENABLED")
 time.sleep(10)

 scheduling_policy = self._create_or_get_scheduling_policy(scheduling_policy_name)
 scheduling_policy_arn = scheduling_policy.get("arn")

 queue = self._create_or_get_queue(queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy_arn)
 if queue.get("state") != "ENABLED":
 self._update_queue_state(queue_name, "ENABLED")
 self._wait_for_queue_state(queue_name, "VALID", "ENABLED")
 time.sleep(10)

 quota_share = self._create_or_get_quota_share(quota_share_name, queue_name)
 if quota_share.get("state") != "ENABLED":
 self._update_quota_share_state(quota_share["quotaShareArn"], "ENABLED")
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")
 time.sleep(10)
 def get_or_create_resources(self):
 service_environment = self._create_or_get_service_environment(self.service_environment_name)
 scheduling_policy = self._create_or_get_scheduling_policy(self.scheduling_policy_name)

 return queue, service_environment, scheduling_policy, quota_share
 queue = self._create_or_get_queue(self.queue_name, service_environment["serviceEnvironmentArn"],
 scheduling_policy.get("arn"))
 self._wait_for_queue_state(self.queue_name, "VALID", "ENABLED")

 def delete_resources(
 self,
 queue_name=None,
 service_environment_name=None,
 scheduling_policy_name=None,
 quota_share_name=None
 ):
 queue_name = queue_name or self.queue_name
 service_environment_name = service_environment_name or self.service_environment_name
 scheduling_policy_name = scheduling_policy_name or self.scheduling_policy_name
 quota_share_name = quota_share_name or self.quota_share_name
 quota_share = self._create_or_get_quota_share(self.quota_share_name, self.queue_name)
 self._wait_for_quota_share_state(quota_share["quotaShareArn"], "VALID", "ENABLED")

 return queue, service_environment, scheduling_policy, quota_share

 def delete_resources(self):
 # Get ARNs needed for deletion
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[queue_name])
 desc_jq = self.batch_client.describe_job_queues(jobQueues=[self.queue_name])
 if desc_jq["jobQueues"]:
 jq_arn = desc_jq["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{quota_share_name}"
 quota_share_arn = f"{jq_arn}/quota-share/{self.quota_share_name}"
 self._delete_quota_share(quota_share_arn)

 self._delete_job_queue(queue_name)
 self._delete_job_queue(self.queue_name)

 sp = self._find_scheduling_policy(scheduling_policy_name)
 sp = self._find_scheduling_policy(self.scheduling_policy_name)
 if sp:
 self._delete_scheduling_policy(sp["arn"])

 self._delete_service_environment(service_environment_name)
 self._delete_service_environment(self.service_environment_name)

26 changes: 23 additions & 3 deletions
sagemaker-train/tests/integ/train/aws_batch/test_queue.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@
import boto3
import botocore
import pytest
import random
import string

from sagemaker.train.model_trainer import ModelTrainer
from sagemaker.train.configs import SourceCode, InputData, Compute
Expand All@@ -29,16 +31,34 @@
from .manager import BatchTestResourceManager


class ShortId:
 ALPHABET = string.ascii_lowercase + string.digits
 DEFAULT_LENGTH = 8

 @staticmethod
 def get(length=DEFAULT_LENGTH):
 return "".join(random.choices(ShortId.ALPHABET, k=length))


@pytest.fixture(scope="module")
def batch_client():
 return boto3.client("batch", region_name="us-west-2")


@pytest.fixture(scope="function")
def batch_test_resource_manager(batch_client):
 resource_manager = BatchTestResourceManager(batch_client=batch_client)
 resource_manager.get_or_create_resources()
 yield resource_manager
 # Guarantee AWS Batch resource name uniqueness across concurrent test runtimes
 test_id = ShortId.get()
 print(f"Integration test ID (used in AWS Batch resource naming): {test_id}")

 resource_manager = BatchTestResourceManager(batch_client=batch_client, test_id=test_id)

 try:
 resource_manager.get_or_create_resources()
 yield resource_manager
 except Exception as e:
 print(f"Exception thrown while creating or yielding AWS Batch resources: {str(e)}")

@mollyheamazonmollyheamazonMar 25, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should raise exception here

add raise
@davlind-amzndavlind-amznMar 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally didn't raise here because I want cleanup to still attempt if we catch an exception
 resource_manager.delete_resources()


Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/sm-training-queues_quota-management.ipynb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,7 +177,7 @@
 "metadata": {},
 "source": [
 "## Create TrainingQueue object\n",
 "Using our queue is as easy as referring to it by name in the TrainingQueue contructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 "Using our queue is as easy as referring to it by name in the TrainingQueue constructor. The TrainingQueue class within the SageMaker Python SDK provides built in support for working with Batch queues."
 ]
 },
 {
Expand Down

2 changes: 1 addition & 1 deletion
v3-examples/training-examples/aws_batch/utils/aws_batch_resource_management.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,7 +473,7 @@ def create_quota_share(self, create_qs_request: dict):
 jobQueues=[create_qs_request["jobQueue"]]
 )
 jq_arn = desc_jqs_resp["jobQueues"][0]["jobQueueArn"]
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request["quotaShareName"]}"
 quota_share_arn = f"{jq_arn}/quota-share/{create_qs_request['quotaShareName']}"
 return {
 "quotaShareName": create_qs_request["quotaShareName"],
 "quotaShareArn": quota_share_arn,
Expand Down
Loading