From 5d48b5c8b5108c1078059aa27456b33e8dbe68f7 Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Wed, 24 Jan 2024 09:24:12 -0800
Subject: [PATCH] Run some tests explicitly in both arm and x64. (#141910)

This is part of the process to start running tests on either arm64 or x64 if the host architecture is not important for the test.
---
 .ci.yaml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 67f99a7ebc9..d1af01b4ade 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -3657,7 +3657,6 @@ targets:
 
   - name: Mac_x64 module_test_ios
     recipe: devicelab/devicelab_drone
-    bringup: true
     timeout: 60
     properties:
       dependencies: >-
@@ -3740,8 +3739,9 @@ targets:
       - bin/**
       - .ci.yaml
 
-  - name: Mac plugin_lint_mac
+  - name: Mac_x64 plugin_lint_mac
     recipe: devicelab/devicelab_drone
+    bringup: true
     timeout: 60
     properties:
       dependencies: >-
@@ -3961,8 +3961,25 @@ targets:
       - bin/**
       - .ci.yaml
 
-  - name: Mac tool_tests_commands
+  - name: Mac_x64 tool_tests_commands
     recipe: flutter/flutter_drone
+    bringup: true
+    timeout: 60
+    properties:
+      add_recipes_cq: "true"
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:34v3"},
+          {"dependency": "open_jdk", "version": "version:17"}
+        ]
+      shard: tool_tests
+      subshard: commands
+      tags: >
+        ["framework", "hostonly", "shard", "mac"]
+
+  - name: Mac_arm64 tool_tests_commands
+    recipe: flutter/flutter_drone
+    bringup: true
     timeout: 60
     properties:
       add_recipes_cq: "true"
@@ -4406,9 +4423,20 @@ targets:
       - .ci.yaml
       - dev/**
 
-  - name: Mac_ios integration_test_test_ios
+  - name: Mac_x64_ios integration_test_test_ios
     recipe: devicelab/devicelab_drone
     presubmit: false
+    bringup: true
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab", "ios", "mac"]
+      task_name: integration_test_test_ios
+
+  - name: Mac_arm64_ios integration_test_test_ios
+    recipe: devicelab/devicelab_drone
+    presubmit: false
+    bringup: true
     timeout: 60
     properties:
       tags: >
@@ -4487,8 +4515,9 @@ targets:
         ["devicelab", "hostonly", "mac", "arm64"]
       task_name: ios_app_with_extensions_test
 
-  - name: Mac_ios ios_content_validation_test
+  - name: Mac_x64_ios ios_content_validation_test
     recipe: devicelab/devicelab_drone
+    bringup: true
     presubmit: false
     timeout: 60
     properties:
@@ -4717,9 +4746,20 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: wide_gamut_ios
 
-  - name: Mac_ios hot_mode_dev_cycle_ios__benchmark
+  - name: Mac_x64_ios hot_mode_dev_cycle_ios__benchmark
     recipe: devicelab/devicelab_drone
     presubmit: false
+    bringup: true
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab", "ios", "mac"]
+      task_name: hot_mode_dev_cycle_ios__benchmark
+
+  - name: Mac_arm64_ios hot_mode_dev_cycle_ios__benchmark
+    recipe: devicelab/devicelab_drone
+    presubmit: false
+    bringup: true
     timeout: 60
     properties:
       tags: >
@@ -4803,8 +4843,27 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: spell_check_test_ios
 
-  - name: Mac native_ui_tests_macos
+  - name: Mac_x64 native_ui_tests_macos
     recipe: devicelab/devicelab_drone
+    bringup: true
+    timeout: 60
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
+      tags: >
+        ["devicelab", "hostonly", "mac"]
+      task_name: native_ui_tests_macos
+    runIf:
+      - dev/**
+      - packages/flutter_tools/**
+      - bin/**
+      - .ci.yaml
+
+  - name: Mac_arm64 native_ui_tests_macos
+    recipe: devicelab/devicelab_drone
+    bringup: true
     timeout: 60
     properties:
       dependencies: >-
@@ -4871,9 +4930,10 @@ targets:
       - bin/**
       - .ci.yaml
 
-  - name: Mac run_release_test_macos
+  - name: Mac_x64 run_release_test_macos
     recipe: devicelab/devicelab_drone
     presubmit: false
+    bringup: true
     timeout: 60
     properties:
       dependencies: >-