Merge branch 'master' into fix-jumpstart-test

Author: benieric

src/sagemaker/image_uri_config/spark.json

@@ -20,6 +20,7 @@
                     "ap-southeast-2": "440695851116",
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
+                    "ap-southeast-5": "841784149062",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -61,6 +62,7 @@
                     "ap-southeast-2": "440695851116",
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
+                    "ap-southeast-5": "841784149062",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -102,6 +104,7 @@
                     "ap-southeast-2": "440695851116",
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
+                    "ap-southeast-5": "841784149062",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -143,6 +146,7 @@
                     "ap-southeast-2": "440695851116",
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
+                    "ap-southeast-5": "841784149062",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",
@@ -184,6 +188,7 @@
                     "ap-southeast-2": "440695851116",
                     "ap-southeast-3": "800295151634",
                     "ap-southeast-4": "819679513684",
+                    "ap-southeast-5": "841784149062",
                     "ca-central-1": "446299261295",
                     "ca-west-1": "000907499111",
                     "cn-north-1": "671472414489",

src/sagemaker/local/image.py

@@ -473,7 +473,12 @@ def write_processing_config_files(
         """
         config_path = os.path.join(self.container_root, host, "config")
 
-        resource_config = {"current_host": host, "hosts": self.hosts}
+        resource_config = {
+            "current_host": host,
+            "hosts": self.hosts,
+            "network_interface_name": "eth0",
+            "current_instance_type": self.instance_type,
+        }
         _write_json_file(os.path.join(config_path, "resourceconfig.json"), resource_config)
 
         processing_job_config = {
@@ -519,7 +524,12 @@ def write_config_files(self, host, hyperparameters, input_data_config):
         """
         config_path = os.path.join(self.container_root, host, "input", "config")
 
-        resource_config = {"current_host": host, "hosts": self.hosts}
+        resource_config = {
+            "current_host": host,
+            "hosts": self.hosts,
+            "network_interface_name": "eth0",
+            "current_instance_type": self.instance_type,
+        }
 
         json_input_data_config = {}
         for c in input_data_config: