From 5128deda838f7dbf40530bd86ab581c5cf75fe2e Mon Sep 17 00:00:00 2001
From: "Joshua C. Forest" <josh.forest@rstudio.com>
Date: Tue, 26 Jul 2022 10:18:17 -0400
Subject: [PATCH 1/3] update to the instance types we use in python-builds

---
 serverless-resources.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/serverless-resources.yml b/serverless-resources.yml
index fdca450..6a85cec 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -105,16 +105,15 @@ rBuildsBatchComputeEnvironment:
       InstanceRole:
         "Fn::GetAtt": [ rBuildsIamInstanceProfile, Arn ]
       InstanceTypes:
-        - m4.large
-        - m4.xlarge
-        - m4.2xlarge
-        - m4.4xlarge
-        - m4.10xlarge
-        - m4.16xlarge
-        - r4.large
-        - r4.xlarge
-        - r4.2xlarge
-        - r4.4xlarge
+        - m6i
+        - m5
+        - m5a
+        - r6i
+        - r5
+        - r5a
+        - c6i
+        - c5
+        - c5a
       Ec2KeyPair: ${self:custom.ec2KeyPair}
       Tags: ${self:provider.stackTags}
       MinvCpus: 0

From f9030c707fa5ada6054b796fd6ae7a23160c1f96 Mon Sep 17 00:00:00 2001
From: "Joshua C. Forest" <josh.forest@rstudio.com>
Date: Tue, 26 Jul 2022 10:20:16 -0400
Subject: [PATCH 2/3] also update bid percentage to 85% like in python-builds

---
 serverless-resources.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/serverless-resources.yml b/serverless-resources.yml
index 6a85cec..7642b31 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -101,7 +101,7 @@ rBuildsBatchComputeEnvironment:
       SecurityGroupIds: ${self:custom.securityGroupIds}
       Subnets: ${self:custom.subnets}
       Type: SPOT
-      BidPercentage: 60
+      BidPercentage: 85
       InstanceRole:
         "Fn::GetAtt": [ rBuildsIamInstanceProfile, Arn ]
       InstanceTypes:

From c3ee528dc007c86800bf27f43639f9f127b27388 Mon Sep 17 00:00:00 2001
From: "Joshua C. Forest" <josh.forest@rstudio.com>
Date: Tue, 26 Jul 2022 10:29:40 -0400
Subject: [PATCH 3/3] update to gp3 volumes as well

---
 serverless-resources.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/serverless-resources.yml b/serverless-resources.yml
index 7642b31..4b05aee 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -82,7 +82,7 @@ rBuildsEcsLaunchTemplate:
       BlockDeviceMappings:
         - DeviceName: /dev/xvdcz
           Ebs:
-            VolumeType: gp2
+            VolumeType: gp3
             VolumeSize: 64
 
 rBuildsBatchComputeEnvironment: