Merge branch 'master' into master

Author: benieric

src/sagemaker/image_uri_config/spark.json

@@ -21,6 +21,7 @@
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
                     "ap-southeast-5": "841784149062",
+                    "ap-southeast-7": "471112967968",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -36,6 +37,7 @@
                     "il-central-1": "408426139102",
                     "me-central-1": "395420993607",
                     "me-south-1": "750251592176",
+                    "mx-central-1": "211125459255",
                     "sa-east-1": "737130764395",
                     "us-east-1": "173754725891",
                     "us-east-2": "314815235551",
@@ -63,6 +65,7 @@
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
                     "ap-southeast-5": "841784149062",
+                    "ap-southeast-7": "471112967968",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -78,6 +81,7 @@
                     "il-central-1": "408426139102",
                     "me-central-1": "395420993607",
                     "me-south-1": "750251592176",
+                    "mx-central-1": "211125459255",
                     "sa-east-1": "737130764395",
                     "us-east-1": "173754725891",
                     "us-east-2": "314815235551",
@@ -105,6 +109,7 @@
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
                     "ap-southeast-5": "841784149062",
+                    "ap-southeast-7": "471112967968",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -120,6 +125,7 @@
                     "il-central-1": "408426139102",
                     "me-central-1": "395420993607",
                     "me-south-1": "750251592176",
+                    "mx-central-1": "211125459255",
                     "sa-east-1": "737130764395",
                     "us-east-1": "173754725891",
                     "us-east-2": "314815235551",
@@ -147,6 +153,7 @@
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
                     "ap-southeast-5": "841784149062",
+                    "ap-southeast-7": "471112967968",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -162,6 +169,7 @@
                     "il-central-1": "408426139102",
                     "me-central-1": "395420993607",
                     "me-south-1": "750251592176",
+                    "mx-central-1": "211125459255",
                     "sa-east-1": "737130764395",
                     "us-east-1": "173754725891",
                     "us-east-2": "314815235551",
@@ -189,6 +197,7 @@
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
                     "ap-southeast-5": "841784149062",
+                    "ap-southeast-7": "471112967968",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -204,6 +213,7 @@
                     "il-central-1": "408426139102",
                     "me-central-1": "395420993607",
                     "me-south-1": "750251592176",
+                    "mx-central-1": "211125459255",
                     "sa-east-1": "737130764395",
                     "us-east-1": "173754725891",
                     "us-east-2": "314815235551",

tests/integ/sagemaker/serve/test_serve_model_builder_gpu.py

@@ -96,6 +96,8 @@ def model_builder(request):
 def test_non_text_generation_model_single_GPU(
     sagemaker_session, model_builder, model_input, **kwargs
 ):
+    if kwargs["instance_type"] == "ml.p2.xlarge":
+        pytest.skip("Instance type ml.p2.xlarge has been deprecated")
     iam_client = sagemaker_session.boto_session.client("iam")
     role_arn = iam_client.get_role(RoleName="SageMakerRole")["Role"]["Arn"]
     model = model_builder.build(role_arn=role_arn, sagemaker_session=sagemaker_session)
@@ -147,6 +149,8 @@ def test_non_text_generation_model_single_GPU(
 def test_non_text_generation_model_multi_GPU(
     sagemaker_session, model_builder, model_input, **kwargs
 ):
+    if kwargs["instance_type"] == "ml.p2.xlarge":
+        pytest.skip("Instance type ml.p2.xlarge has been deprecated")
     iam_client = sagemaker_session.boto_session.client("iam")
     role_arn = iam_client.get_role(RoleName="SageMakerRole")["Role"]["Arn"]
     caught_ex = None

tests/integ/sagemaker/serve/test_serve_transformers.py

@@ -97,6 +97,9 @@ def model_builder(request):
 def test_pytorch_transformers_sagemaker_endpoint(
     sagemaker_session, model_builder, model_input, **kwargs
 ):
+    if kwargs["instance_type"] == "ml.p2.xlarge":
+        pytest.skip("Instance type ml.p2.xlarge has been deprecated")
+
     logger.info("Running in SAGEMAKER_ENDPOINT mode...")
     caught_ex = None