From 53c732f48431d2a4b565be062546462d19fd9ca7 Mon Sep 17 00:00:00 2001
From: Zachary Anderson <zanderso@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:24:41 -0700
Subject: [PATCH] Shift some mac Android tests to Mokey devices in staging
 (#152499)

Following https://github.com/flutter/flutter/issues/152406

For https://github.com/flutter/flutter/issues/148085
---
 .ci.yaml | 65 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index d65dffa7dd8..d707495fc13 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -207,6 +207,29 @@ platform_properties:
       os: Mac-13|Mac-14
       cpu: arm64
       device_type: "msm8952"
+
+  mac_mokey:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:34v3"},
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
+          {"dependency": "open_jdk", "version": "version:17"}
+        ]
+      os: Mac-13|Mac-14
+      cpu: x86
+      device_type: "mokey"
+  mac_arm64_mokey:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:34v3"},
+          {"dependency": "open_jdk", "version": "version:17"}
+        ]
+      os: Mac-13|Mac-14
+      cpu: arm64
+      device_type: "mokey"
+
   mac_pixel_7pro:
     properties:
       dependencies: >-
@@ -4293,24 +4316,26 @@ targets:
         ["devicelab", "android", "mac", "pixel", "7pro"]
       task_name: hello_world_android__compile
 
-  # mac motog4 test
-  - name: Mac_arm64_android hello_world_android__compile
+  # mac mokey test
+  - name: Mac_arm64_mokey hello_world_android__compile
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac", "arm64"]
+        ["devicelab", "android", "mac", "arm64", "mokey"]
       task_name: hello_world_android__compile
 
-  # mac motog4 benchmark
-  - name: Mac_android hot_mode_dev_cycle__benchmark
+  # mac mokey benchmark
+  - name: Mac_mokey hot_mode_dev_cycle__benchmark
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac"]
+        ["devicelab", "android", "mac", "mokey"]
       task_name: hot_mode_dev_cycle__benchmark
 
   - name: Mac_pixel_7pro integration_test_test
@@ -4322,14 +4347,15 @@ targets:
         ["devicelab", "android", "mac", "pixel", "7pro"]
       task_name: integration_test_test
 
-  # mac motog4 test
-  - name: Mac_arm64_android integration_test_test
+  # mac mokey test
+  - name: Mac_arm64_mokey integration_test_test
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac", "arm64"]
+        ["devicelab", "android", "mac", "arm64", "mokey"]
       task_name: integration_test_test
 
   - name: Mac_pixel_7pro integration_ui_frame_number
@@ -4341,14 +4367,15 @@ targets:
         ["devicelab", "android", "mac", "pixel", "7pro"]
       task_name: integration_ui_frame_number
 
-  # mac motog4 benchmark
-  - name: Mac_android microbenchmarks
+  # mac mokey benchmark
+  - name: Mac_mokey microbenchmarks
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac"]
+        ["devicelab", "android", "mac", "mokey"]
       task_name: microbenchmarks
 
   - name: Mac_pixel_7pro native_assets_android
@@ -4372,9 +4399,10 @@ targets:
         ["devicelab", "android", "mac", "pixel", "7pro"]
       task_name: run_debug_test_android
 
-  # mac motog4 test
-  - name: Mac_arm64_android run_debug_test_android
+  # mac mokey test
+  - name: Mac_arm64_mokey run_debug_test_android
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     runIf:
       - .ci.yaml
@@ -4382,7 +4410,7 @@ targets:
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac", "arm64"]
+        ["devicelab", "android", "mac", "arm64", "mokey"]
       task_name: run_debug_test_android
 
   - name: Mac_pixel_7pro run_release_test
@@ -4397,9 +4425,10 @@ targets:
         ["devicelab", "android", "mac", "pixel", "7pro"]
       task_name: run_release_test
 
-  # mac motog4 test
-  - name: Mac_arm64_android run_release_test
+  # mac mokey test
+  - name: Mac_arm64_mokey run_release_test
     recipe: devicelab/devicelab_drone
+    bringup: true # https://github.com/flutter/flutter/issues/148085
     presubmit: false
     runIf:
       - .ci.yaml
@@ -4407,7 +4436,7 @@ targets:
     timeout: 60
     properties:
       tags: >
-        ["devicelab", "android", "mac", "arm64"]
+        ["devicelab", "android", "mac", "arm64", "mokey"]
       task_name: run_release_test
 
   - name: Mac_ios animation_with_microtasks_perf_ios__timeline_summary