From 6467fa46d133e02beb384cd2c4af2378329d695b Mon Sep 17 00:00:00 2001
From: Zach Anderson <zra@google.com>
Date: Sun, 25 Feb 2024 11:14:22 -0800
Subject: [PATCH] Further shard Android emulator tests

---
 .ci.yaml                                     | 24 +++++++-
 ci/builders/linux_android_emulator.json      | 22 -------
 ci/builders/linux_android_emulator_skia.json | 62 ++++++++++++++++++++
 3 files changed, 84 insertions(+), 24 deletions(-)
 create mode 100644 ci/builders/linux_android_emulator_skia.json

diff --git a/.ci.yaml b/.ci.yaml
index 2aab610f907d3..927b844018111 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -59,7 +59,27 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - ci/builders/linux_android_emulator.json
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+      - testing/scenario_app/**
+
+  - name: Linux linux_android_emulator_skia_tests
+    bringup: true
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_android_emulator_skia
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
     runIf:
       - .ci.yaml
       - ci/builders/linux_android_emulator.json
@@ -80,7 +100,7 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
     runIf:
       - .ci.yaml
       - ci/builders/linux_android_emulator.json
diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json
index ad9763b3ff74d..6f8bd22834448 100644
--- a/ci/builders/linux_android_emulator.json
+++ b/ci/builders/linux_android_emulator.json
@@ -58,28 +58,6 @@
                             "android"
                     ]
                 },
-                {
-                    "language": "dart",
-                    "name": "Android Scenario App Integration Tests (Skia)",
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_34_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8759428741582061553"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
-                    "parameters": [
-                        "--out-dir=../out/android_emulator_debug_x64",
-                        "--no-enable-impeller"
-                    ]
-                },
                 {
                     "language": "dart",
                     "name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
diff --git a/ci/builders/linux_android_emulator_skia.json b/ci/builders/linux_android_emulator_skia.json
new file mode 100644
index 0000000000000..704476a321944
--- /dev/null
+++ b/ci/builders/linux_android_emulator_skia.json
@@ -0,0 +1,62 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=x64",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "android_emulator_skia_debug_x64"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "name": "android_emulator_skia_debug_x64",
+            "ninja": {
+                "config": "android_emulator_skia_debug_x64",
+                "targets": [
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "dart",
+                    "name": "Android Scenario App Integration Tests (Skia)",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_34_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+                    "parameters": [
+                        "--out-dir=../out/android_emulator_skia_debug_x64",
+                        "--no-enable-impeller"
+                    ]
+                }
+            ]
+        }
+    ]
+}