fix: fix regions for updated RL images (#1805)

Author: laurenyu

src/sagemaker/image_uri_config/coach-tensorflow.json

@@ -157,11 +157,8 @@
                 "ap-southeast-2": "462105765813",
                 "ca-central-1": "462105765813",
                 "eu-central-1": "462105765813",
-                "eu-north-1": "462105765813",
                 "eu-west-1": "462105765813",
                 "eu-west-2": "462105765813",
-                "eu-west-3": "462105765813",
-                "sa-east-1": "462105765813",
                 "us-east-1": "462105765813",
                 "us-east-2": "462105765813",
                 "us-west-1": "462105765813",

src/sagemaker/image_uri_config/ray-pytorch.json

@@ -12,11 +12,8 @@
                 "ap-southeast-2": "462105765813",
                 "ca-central-1": "462105765813",
                 "eu-central-1": "462105765813",
-                "eu-north-1": "462105765813",
                 "eu-west-1": "462105765813",
                 "eu-west-2": "462105765813",
-                "eu-west-3": "462105765813",
-                "sa-east-1": "462105765813",
                 "us-east-1": "462105765813",
                 "us-east-2": "462105765813",
                 "us-west-1": "462105765813",

src/sagemaker/image_uri_config/ray-tensorflow.json

@@ -128,11 +128,8 @@
                 "ap-southeast-2": "462105765813",
                 "ca-central-1": "462105765813",
                 "eu-central-1": "462105765813",
-                "eu-north-1": "462105765813",
                 "eu-west-1": "462105765813",
                 "eu-west-2": "462105765813",
-                "eu-west-3": "462105765813",
-                "sa-east-1": "462105765813",
                 "us-east-1": "462105765813",
                 "us-east-2": "462105765813",
                 "us-west-1": "462105765813",
@@ -151,11 +148,8 @@
                 "ap-southeast-2": "462105765813",
                 "ca-central-1": "462105765813",
                 "eu-central-1": "462105765813",
-                "eu-north-1": "462105765813",
                 "eu-west-1": "462105765813",
                 "eu-west-2": "462105765813",
-                "eu-west-3": "462105765813",
-                "sa-east-1": "462105765813",
                 "us-east-1": "462105765813",
                 "us-east-2": "462105765813",
                 "us-west-1": "462105765813",

src/sagemaker/image_uri_config/vw.json

@@ -11,11 +11,8 @@
                 "ap-southeast-2": "462105765813",
                 "ca-central-1": "462105765813",
                 "eu-central-1": "462105765813",
-                "eu-north-1": "462105765813",
                 "eu-west-1": "462105765813",
                 "eu-west-2": "462105765813",
-                "eu-west-3": "462105765813",
-                "sa-east-1": "462105765813",
                 "us-east-1": "462105765813",
                 "us-east-2": "462105765813",
                 "us-west-1": "462105765813",

tests/integ/__init__.py

@@ -72,11 +72,28 @@
     "us-west-2",
 ]
 
+RL_SUPPORTED_REGIONS = (
+    "ap-northeast-1",
+    "ap-northeast-2",
+    "ap-south-1",
+    "ap-southeast-1",
+    "ap-southeast-2",
+    "ca-central-1",
+    "eu-central-1",
+    "eu-west-1",
+    "eu-west-2",
+    "us-east-1",
+    "us-east-2",
+    "us-west-1",
+    "us-west-2",
+)
+
 NO_LDA_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
 NO_MARKET_PLACE_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
 NO_AUTO_ML_REGIONS = ["sa-east-1", "me-south-1", "ap-east-1", "eu-west-3"]
 NO_MODEL_MONITORING_REGIONS = ["me-south-1"]
 
+
 EFS_TEST_ENABLED_REGION = []
 
 logging.getLogger("boto3").setLevel(logging.INFO)

tests/integ/test_rl.py

@@ -19,7 +19,7 @@
 
 from sagemaker.rl import RLEstimator, RLFramework, RLToolkit
 from sagemaker.utils import sagemaker_timestamp, unique_name_from_base
-from tests.integ import DATA_DIR
+from tests.integ import DATA_DIR, RL_SUPPORTED_REGIONS, test_region
 from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name
 
 
@@ -51,6 +51,10 @@ def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance
     assert 0 < action[0][1] < 1
 
 
+@pytest.mark.skipif(
+    test_region() not in RL_SUPPORTED_REGIONS,
+    reason="Updated RL images aren't in {}".format(test_region()),
+)
 def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
     estimator = _test_coach(
         sagemaker_session,
@@ -98,6 +102,10 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_
     )
 
 
+@pytest.mark.skipif(
+    test_region() not in RL_SUPPORTED_REGIONS,
+    reason="Updated RL images aren't in {}".format(test_region()),
+)
 @pytest.mark.canary_quick
 def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
     source_dir = os.path.join(DATA_DIR, "ray_cartpole")