From 6210be58d4ba95a60713fa54ef6462dc1c0b666b Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 13 Apr 2023 17:31:23 -0700
Subject: [PATCH 1/3] Change v2 Mac orchestrator builders to Linux

---
 .ci.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index c89b7890e8df5..6c954c9b67478 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -340,13 +340,11 @@ targets:
       build_host: "true"
     timeout: 75
 
-  - name: Mac mac_android_aot_engine
+  - name: Linux mac_android_aot_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       config_name: mac_android_aot_engine
-      $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
 
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
@@ -361,7 +359,7 @@ targets:
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }
 
-  - name: Mac mac_unopt
+  - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt

From 0a96ae3aa74d7cef27d9381c54644b2048845908 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 13 Apr 2023 17:36:24 -0700
Subject: [PATCH 2/3] bringup, re-add Macs

---
 .ci.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.ci.yaml b/.ci.yaml
index 6c954c9b67478..e07f2ea1ff6b2 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -340,7 +340,16 @@ targets:
       build_host: "true"
     timeout: 75
 
+  - name: Mac mac_android_aot_engine
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      config_name: mac_android_aot_engine
+      $flutter/osx_sdk : >-
+        { "sdk_version": "14a5294e" }
+
   - name: Linux mac_android_aot_engine
+    bringup: true
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
@@ -359,7 +368,15 @@ targets:
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }
 
+  - name: Mac mac_unopt
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: mac_unopt
+      add_recipes_cq: "true"
+    timeout: 60
+
   - name: Linux mac_unopt
+    bringup: true
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt

From 59fe46cff6f03f2f2373ad06a33e34fa01440024 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 13 Apr 2023 17:47:58 -0700
Subject: [PATCH 3/3] Remove mac_unopt

---
 .ci.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index e07f2ea1ff6b2..d30f22249a2ac 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -345,8 +345,6 @@ targets:
     timeout: 60
     properties:
       config_name: mac_android_aot_engine
-      $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
 
   - name: Linux mac_android_aot_engine
     bringup: true
@@ -375,14 +373,6 @@ targets:
       add_recipes_cq: "true"
     timeout: 60
 
-  - name: Linux mac_unopt
-    bringup: true
-    recipe: engine_v2/engine_v2
-    properties:
-      config_name: mac_unopt
-      add_recipes_cq: "true"
-    timeout: 60
-
   - name: Mac Unopt
     bringup: true
     recipe: engine/engine_unopt