From 7e8d7967f502aff833b01bba2698b9e7260da65e Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Wed, 12 Jun 2024 10:45:26 -0500
Subject: [PATCH 1/3] Give mac_host_engine tests a longer timeout and allow to
 run on Mac-14

---
 .ci.yaml                         |  2 +-
 ci/builders/mac_host_engine.json | 33 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index b69cc37ede0be..35a1c8b987902 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -363,7 +363,7 @@ targets:
           "sdk_version": "15a240d"
         }
     drone_dimensions:
-      - os=Mac-13
+      - os=Mac-13|Mac-14
 
   - name: Linux mac_clangd
     recipe: engine_v2/engine_v2
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index f72aabce9809f..023368e80241c 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -15,7 +15,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-13|Mac-14",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -84,7 +84,8 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -100,7 +101,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-13|Mac-14",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -163,7 +164,8 @@
                         "--engine-capture-core-dump"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -180,7 +182,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-13|Mac-14",
                 "cpu=x86",
                 "mac_model=Macmini8,1"
             ],
@@ -251,7 +253,8 @@
                         "dart,dart-host,engine"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         },
         {
             "archives": [
@@ -268,7 +271,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-14",
                 "cpu=x86"
             ],
             "gclient_variables": {
@@ -319,9 +322,11 @@
             },
             "properties": {
                 "$flutter/osx_sdk": {
-                    "sdk_version": "15a240d"
+                    "sdk_version": "15a240d",
+                    "cleanup_cache": true
                 }
-            }
+            },
+            "timeout": 90
         },
         {
             "archives": [
@@ -337,7 +342,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-13|Mac-14",
                 "cpu=x86"
             ],
             "gclient_variables": {
@@ -386,7 +391,8 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            }
+            },
+            "timeout": 90
         },
         {
             "archives": [
@@ -409,7 +415,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-13",
+                "os=Mac-13|Mac-14",
                 "cpu=arm64"
             ],
             "gclient_variables": {
@@ -478,7 +484,8 @@
                         "impeller-golden"
                     ]
                 }
-            ]
+            ],
+            "timeout": 90
         }
     ],
     "generators": {

From 5ce9a6c4849d67ac16e664a61247eeb626f84590 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Wed, 12 Jun 2024 12:15:37 -0500
Subject: [PATCH 2/3] test with a short timeout to ensure timeout works

---
 ci/builders/mac_host_engine.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 023368e80241c..8d78866527eb9 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -271,7 +271,7 @@
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-14",
+                "os=Mac-13|Mac-14",
                 "cpu=x86"
             ],
             "gclient_variables": {
@@ -322,11 +322,10 @@
             },
             "properties": {
                 "$flutter/osx_sdk": {
-                    "sdk_version": "15a240d",
-                    "cleanup_cache": true
+                    "sdk_version": "15a240d"
                 }
             },
-            "timeout": 90
+            "timeout": 4
         },
         {
             "archives": [

From 7c8bda02fdb9a1c1065d81432dd56a830fff1d74 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Wed, 12 Jun 2024 12:21:39 -0500
Subject: [PATCH 3/3] Change back to 90 minutes

---
 ci/builders/mac_host_engine.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 8d78866527eb9..3e151824fd822 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -325,7 +325,7 @@
                     "sdk_version": "15a240d"
                 }
             },
-            "timeout": 4
+            "timeout": 90
         },
         {
             "archives": [