From aed1f0a10759eb3d98dc1df24bd9357cf7bcd7e6 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Fri, 3 May 2024 21:51:18 +0000
Subject: [PATCH 1/2] run on more stable spots

---
 .github/workflows/ci.yml         |  9 ++++-----
 .github/workflows/start-spot.yml |  3 ++-
 .github/workflows/stop-spot.yml  | 30 ------------------------------
 3 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 .github/workflows/stop-spot.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc7fa5753ce..deecc0714ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,9 +25,8 @@ jobs:
       ebs_cache_size_gb: 256
       runner_concurrency: 20
       subaction: ${{ inputs.runner_action || 'start' }}
-      # This instance list has a spot placement score of 9/10. Note we used to just use m6a.32xlarge, which had a score of 1!
-      # https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#SpotPlacementScore:
-      ec2_instance_type: i4i.32xlarge m6a.32xlarge m6i.32xlarge m6id.32xlarge m6idn.32xlarge m6in.32xlarge m7a.32xlarge r6a.32xlarge r6i.32xlarge r6id.32xlarge
+      # Use instance types with low interruption rate in us-east-2 https://aws.amazon.com/ec2/spot/instance-advisor/
+      ec2_instance_type: r6in.32xlarge r6a.32xlarge i4i.32xlarge r7iz.32xlarge
       ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_spot_instance_strategy: BestEffort
       ec2_instance_ttl: 40 # refreshed by jobs
@@ -192,7 +191,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: yarn-project-test-${{ github.actor }}-x86
       - name: "Yarn Project Tests"
-        timeout-minutes: 30
+        timeout-minutes: 25
         run: earthly-ci --no-output ./yarn-project/+test
 
   prover-client-test:
@@ -292,7 +291,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
       - name: "Docs Preview"
-        timeout-minutes: 30
+        timeout-minutes: 25
         run: earthly --no-output ./docs/+deploy-preview --PR=${{ github.event.number }} --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
 
   # push benchmarking binaries to dockerhub registry
diff --git a/.github/workflows/start-spot.yml b/.github/workflows/start-spot.yml
index 539567f08cb..b4ed1f3ca1b 100644
--- a/.github/workflows/start-spot.yml
+++ b/.github/workflows/start-spot.yml
@@ -18,7 +18,8 @@ jobs:
       ebs_cache_size_gb: 256
       runner_concurrency: 20
       subaction: ${{ inputs.action }}
-      ec2_instance_type: m6a.32xlarge
+      # Use instance types with low interruption rate in us-east-2 https://aws.amazon.com/ec2/spot/instance-advisor/
+      ec2_instance_type: r6in.32xlarge r6a.32xlarge i4i.32xlarge r7iz.32xlarge
       ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_instance_ttl: 40 # refreshed by jobs
     secrets: inherit
diff --git a/.github/workflows/stop-spot.yml b/.github/workflows/stop-spot.yml
deleted file mode 100644
index 750fca5a523..00000000000
--- a/.github/workflows/stop-spot.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Useful if the spot runners are in a bad state
-name: Stop Personal Spot
-on:
-  workflow_dispatch: {}
-jobs:
-  stop-build-x86:
-    uses: ./.github/workflows/setup-runner.yml
-    with:
-      runner_label: ${{ github.actor }}-x86
-      subaction: stop
-      # not used:
-      ebs_cache_size_gb: 128
-      runner_concurrency: 20
-      ec2_instance_type: m6a.32xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
-      ec2_instance_ttl: 40
-    secrets: inherit
-
-  stop-bench:
-    uses: ./.github/workflows/setup-runner.yml
-    with:
-      runner_label: ${{ github.actor }}-bench-x86
-      subaction: stop
-      # not used:
-      ebs_cache_size_gb: 32
-      runner_concurrency: 1
-      ec2_instance_type: m6a.4xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
-      ec2_instance_ttl: 15
-    secrets: inherit
\ No newline at end of file

From 6e2c71a96df180498889de807e6799064dfd30bf Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Fri, 3 May 2024 17:52:30 -0400
Subject: [PATCH 2/2] Update ci.yml

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index deecc0714ae..6d1a42ebca2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,7 +191,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: yarn-project-test-${{ github.actor }}-x86
       - name: "Yarn Project Tests"
-        timeout-minutes: 25
+        timeout-minutes: 30
         run: earthly-ci --no-output ./yarn-project/+test
 
   prover-client-test:
@@ -291,7 +291,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
       - name: "Docs Preview"
-        timeout-minutes: 25
+        timeout-minutes: 30
         run: earthly --no-output ./docs/+deploy-preview --PR=${{ github.event.number }} --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
 
   # push benchmarking binaries to dockerhub registry