From 2da405d505c88123623fc4bc9cb164ee1610cef2 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Wed, 7 Sep 2022 14:31:07 -0500
Subject: [PATCH] Mitigate EC2 Spot instance interruptions

Some jobs are failing because EC2 is terminating Spot instances from being
outbid (BidEvictedEvents in CloudTrail).

* Increase bid percentage to 100%
* Remove highly interrupted instance types, leaving only instance types with
  <5% frequency of interruption. https://aws.amazon.com/ec2/spot/instance-advisor/
---
 serverless-resources.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/serverless-resources.yml b/serverless-resources.yml
index e8bdc63..a2aa5c7 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -102,22 +102,15 @@ rBuildsBatchComputeEnvironment:
       SecurityGroupIds: ${self:custom.securityGroupIds}
       Subnets: ${self:custom.subnets}
       Type: SPOT
-      BidPercentage: 85
+      BidPercentage: 100
       InstanceRole:
         "Fn::GetAtt": [ rBuildsIamInstanceProfile, Arn ]
       InstanceTypes:
-        - m6i.xlarge
-        - m6i.2xlarge
-        - m5.xlarge
-        - m5.2xlarge
-        - m5a.xlarge
-        - m5a.2xlarge
         - r5.xlarge
         - r5.2xlarge
         - r5a.xlarge
         - r5a.2xlarge
         - c6i.xlarge
-        - c6i.2xlarge
         - c5.xlarge
         - c5.2xlarge
         - c5a.xlarge