Fixed merge conflict errors (#79)

Author: RedbackThomson

samples/efs-xgboost-mnist-trainingjob.yaml

@@ -26,7 +26,7 @@ spec:
   roleArn: arn:aws:iam::123456789012:role/service-role/AmazonSageMaker-ExecutionRole
   region: us-west-2
   outputDataConfig:
-    s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+    s3OutputPath: s3://my-bucket/xgboost
   resourceConfig:
     instanceCount: 1
     instanceType: ml.m4.xlarge

samples/spot-xgboost-mnist-hpo.yaml

@@ -77,7 +77,7 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
@@ -87,14 +87,14 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
       recordWrapperType: None
       inputMode: File
     outputDataConfig:
-      s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+      s3OutputPath: s3://my-bucket/xgboost
     resourceConfig:
       instanceType: ml.m4.xlarge
       instanceCount: 1
@@ -106,4 +106,4 @@ spec:
     enableNetworkIsolation: true
     enableInterContainerTrafficEncryption: false
     checkpointConfig:
-      s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/checkpoints/
+      s3Uri: s3://my-bucket/xgboost/checkpoints/

samples/spot-xgboost-mnist-trainingjob.yaml

@@ -26,7 +26,7 @@ spec:
   roleArn: arn:aws:iam::123456789012:role/service-role/AmazonSageMaker-ExecutionRole
   region: us-west-2
   outputDataConfig:
-    s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+    s3OutputPath: s3://my-bucket/xgboost
   resourceConfig:
     instanceCount: 1
     instanceType: ml.m4.xlarge
@@ -40,17 +40,17 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
     - channelName: validation
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
   checkpointConfig:
-    s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/checkpoints/
+    s3Uri: s3://my-bucket/xgboost/checkpoints/

samples/xgboost-mnist-custom-endpoint.yaml

@@ -27,7 +27,7 @@ spec:
   region: us-west-2
   sageMakerEndpoint: https://sagemaker.us-west-2.amazonaws.com
   outputDataConfig:
-    s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+    s3OutputPath: s3://my-bucket/xgboost
   resourceConfig:
     instanceCount: 1
     instanceType: ml.m4.xlarge
@@ -39,15 +39,15 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
     - channelName: validation
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None

samples/xgboost-mnist-hpo-custom-endpoint.yaml

@@ -79,7 +79,7 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
@@ -89,14 +89,14 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
       recordWrapperType: None
       inputMode: File
     outputDataConfig:
-      s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+      s3OutputPath: s3://my-bucket/xgboost
     resourceConfig:
       instanceType: ml.m4.xlarge
       instanceCount: 1

samples/xgboost-mnist-hpo.yaml

@@ -81,7 +81,7 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
@@ -91,14 +91,14 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
       recordWrapperType: None
       inputMode: File
     outputDataConfig:
-      s3OutputPath: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost
+      s3OutputPath: s3://my-bucket/xgboost
     resourceConfig:
       instanceType: ml.m4.xlarge
       instanceCount: 1

samples/xgboost-mnist-trainingjob.yaml

@@ -38,15 +38,15 @@ spec:
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/train/
+          s3Uri: s3://my-bucket/xgboost/train/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None
     - channelName: validation
       dataSource:
         s3DataSource:
           s3DataType: S3Prefix
-          s3Uri: https://s3-us-west-2.amazonaws.com/my-bucket/xgboost/validation/
+          s3Uri: s3://my-bucket/xgboost/validation/
           s3DataDistributionType: FullyReplicated
       contentType: text/csv
       compressionType: None