From 18f22415148bce747b3f06162e2e1ffd57008617 Mon Sep 17 00:00:00 2001 From: Mohamed Zeidan Date: Thu, 30 Apr 2026 18:58:16 -0700 Subject: [PATCH 1/2] v2 test updates --- tests/conftest.py | 42 ++---------------- .../spark/test/HelloJavaSparkApp.class | Bin 0 -> 495 bytes .../hello-java-spark/hello-spark-java.jar | Bin 0 -> 4781 bytes .../jumpstart/model/test_jumpstart_model.py | 12 ++--- .../test_jumpstart_private_hub_estimator.py | 8 +++- .../retrieve_uri/test_transfer_learning.py | 4 +- .../test_transfer_learning.py | 8 +--- tests/integ/test_training_compiler.py | 10 ++--- 8 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 tests/data/spark/code/java/hello-java-spark/com/amazonaws/sagemaker/spark/test/HelloJavaSparkApp.class create mode 100644 tests/data/spark/code/java/hello-java-spark/hello-spark-java.jar diff --git a/tests/conftest.py b/tests/conftest.py index 7839c97eba..350a537222 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -641,42 +641,17 @@ def cpu_instance_type(sagemaker_session, request): @pytest.fixture(scope="session") def gpu_instance_type(sagemaker_session, request): - region = sagemaker_session.boto_session.region_name - if region in NO_P3_REGIONS: - return "ml.p2.xlarge" - else: - return "ml.p3.2xlarge" + return "ml.g4dn.xlarge" @pytest.fixture() def gpu_pytorch_instance_type(sagemaker_session, request): - fw_version = None - for pytorch_version_fixture in [ - "pytorch_inference_version", - "huggingface_training_pytorch_latest_version", - "huggingface_inference_pytorch_latest_version", - ]: - if pytorch_version_fixture in request.fixturenames: - fw_version = request.getfixturevalue(pytorch_version_fixture) - if fw_version is None: - fw_version = request.param - region = sagemaker_session.boto_session.region_name - if region in NO_P3_REGIONS: - if Version(fw_version) >= Version("1.13"): - return PYTORCH_RENEWED_GPU - else: - return "ml.p2.xlarge" - else: - return "ml.p3.2xlarge" + return "ml.g4dn.xlarge" @pytest.fixture(scope="session") def gpu_instance_type_list(sagemaker_session, request): - region = sagemaker_session.boto_session.region_name - if region in NO_P3_REGIONS: - return ["ml.p2.xlarge"] - else: - return ["ml.p3.2xlarge", "ml.p2.xlarge"] + return ["ml.g4dn.xlarge"] @pytest.fixture(scope="session") @@ -717,16 +692,7 @@ def pytest_generate_tests(metafunc): cpu_instance_type = "ml.m5.xlarge" if region in NO_M4_REGIONS else "ml.m4.xlarge" params = [cpu_instance_type] - if not ( - region in tests.integ.HOSTING_NO_P3_REGIONS - or region in tests.integ.TRAINING_NO_P3_REGIONS - ): - params.append("ml.p3.2xlarge") - elif not ( - region in tests.integ.HOSTING_NO_P2_REGIONS - or region in tests.integ.TRAINING_NO_P2_REGIONS - ): - params.append("ml.p2.xlarge") + params.append("ml.g4dn.xlarge") metafunc.parametrize("instance_type", params, scope="session") diff --git a/tests/data/spark/code/java/hello-java-spark/com/amazonaws/sagemaker/spark/test/HelloJavaSparkApp.class b/tests/data/spark/code/java/hello-java-spark/com/amazonaws/sagemaker/spark/test/HelloJavaSparkApp.class new file mode 100644 index 0000000000000000000000000000000000000000..66c6e9ab84fe054c85f3f11b178220b7b9618681 GIT binary patch literal 495 zcmZvZ%Sr<=6o&uw;&jH**4EZ*p0DhY7>Nq4HI7 z#E@;Z`z8u74Oli7VgHdkk8vVBQUxoC9D`I+o)ibp)$vb!3edl>l3Q=!%7cLAmxv{?Y@B;LuVLx zTzKLs@Wn&SV=?vPf%)Eh&uEoHmm7FIO z5o@j6c}ND!31-nyo+>S_{c}FhH$f9sdUM?}VEWZ*T%%c?BBPk!eFJ-@gkhaVy$xhx iVgs9$Yw1o}3Yaf2%1f^({>t@#k_Ua0F5IF#gY9okpm9S0 literal 0 HcmV?d00001 diff --git a/tests/data/spark/code/java/hello-java-spark/hello-spark-java.jar b/tests/data/spark/code/java/hello-java-spark/hello-spark-java.jar new file mode 100644 index 0000000000000000000000000000000000000000..827cd79f77158ba2f7aad2350c80c7877d30ab02 GIT binary patch literal 4781 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 Date: Fri, 1 May 2026 00:30:50 -0700 Subject: [PATCH 2/2] instance types update --- .../estimator/test_jumpstart_private_hub_estimator.py | 3 +++ .../private_hub/model/test_jumpstart_private_hub_model.py | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/integ/sagemaker/jumpstart/private_hub/estimator/test_jumpstart_private_hub_estimator.py b/tests/integ/sagemaker/jumpstart/private_hub/estimator/test_jumpstart_private_hub_estimator.py index cee5e71aa3..d512915343 100644 --- a/tests/integ/sagemaker/jumpstart/private_hub/estimator/test_jumpstart_private_hub_estimator.py +++ b/tests/integ/sagemaker/jumpstart/private_hub/estimator/test_jumpstart_private_hub_estimator.py @@ -148,6 +148,7 @@ def test_jumpstart_hub_gated_estimator_with_eula(setup, add_model_references): model_id=model_id, hub_name=os.environ[ENV_VAR_JUMPSTART_SDK_TEST_HUB_NAME], tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}], + instance_type="ml.g5.2xlarge", ) estimator.fit( @@ -162,6 +163,7 @@ def test_jumpstart_hub_gated_estimator_with_eula(setup, add_model_references): tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}], role=get_sm_session().get_caller_identity_arn(), sagemaker_session=get_sm_session(), + instance_type="ml.g5.2xlarge", ) payload = { @@ -182,6 +184,7 @@ def test_jumpstart_hub_gated_estimator_without_eula(setup, add_model_references) model_id=model_id, hub_name=os.environ[ENV_VAR_JUMPSTART_SDK_TEST_HUB_NAME], tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}], + instance_type="ml.g5.2xlarge", ) with pytest.raises(Exception): estimator.fit( diff --git a/tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py b/tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py index 76334330f5..3956c2240d 100644 --- a/tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py +++ b/tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py @@ -116,6 +116,7 @@ def test_jumpstart_hub_gated_model(setup, add_model_references): predictor = model.deploy( accept_eula=True, tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}], + instance_type="ml.g5.2xlarge", ) payload = model.retrieve_example_payload()