From d8c92a445c195540dc32a2e748f48c8acb1d1e63 Mon Sep 17 00:00:00 2001
From: Reid Baker <reidbaker@google.com>
Date: Thu, 13 Feb 2025 13:30:08 -0500
Subject: [PATCH] Remove android 34 redundant emulator tests (#163227)

b/371020223

linux_android_emu and linux_android_emu_34 ran 2 different sets of
dependencies because the adoption of 35 was unstable. The reasons why
wound up being incompatible/bad versions of the build tool dependencies
like the graphics engine chosen was unstable on 35. This was fixed with
dependency changes.

Introduce an unstable linux android emulator configuration that can be
used to prove a dependency set as stable.

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
---
 .ci.yaml | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 0125ba5a6ad..34f1e93a09b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -58,7 +58,9 @@ platform_properties:
       cores: "8"
       device_type: none
       kvm: "1"
-  linux_android_emu_34:
+  # linux_android_emu_unstable is intended to be how flutter-android proves the stability
+  # of new combinations of dependencies.
+  linux_android_emu_unstable:
     properties:
       contexts: >-
         [
@@ -67,8 +69,8 @@ platform_properties:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:35v1"},
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
+          {"dependency": "android_virtual_device", "version": "android_35_google_apis_x64.textpb"},
+          {"dependency": "avd_cipd_version", "version": "build_id:8723189955818532721"},
           {"dependency": "open_jdk", "version": "version:17"}
         ]
       os: Ubuntu
@@ -419,14 +421,6 @@ targets:
       presubmit_max_attempts: "2"
     timeout: 60
 
-  - name: Linux_android_emu_34 android views
-    recipe: devicelab/devicelab_drone
-    properties:
-      tags: >
-        ["framework","hostonly","linux"]
-      task_name: android_views
-    timeout: 60
-
   - name: Linux build_aar_module_test
     recipe: devicelab/devicelab_drone
     timeout: 60
@@ -2177,9 +2171,10 @@ targets:
       task_name: android_defines_test
       presubmit_max_attempts: "2"
 
-  - name: Linux_android_emu_34 android_defines_test
+  - name: Linux_android_emu_unstable android_defines_test
     recipe: devicelab/devicelab_drone
     timeout: 60
+    bringup: true
     properties:
       tags: >
         ["devicelab", "linux"]
@@ -2597,21 +2592,6 @@ targets:
       task_name: external_textures_integration_test
       presubmit_max_attempts: "2"
 
-  - name: Linux_android_emu_34 external_textures_integration_test
-    recipe: devicelab/devicelab_drone
-    timeout: 60
-    # Functionally the same as "presubmit: false", except that we will run on
-    # presubmit during engine rolls. This test is the *only* automated e2e
-    # test for external textures for the engine, it should never break.
-    runIf:
-      - engine/**
-      - DEPS
-      - .ci.yaml
-    properties:
-      tags: >
-        ["devicelab", "linux"]
-      task_name: external_textures_integration_test
-
   # linux mokey benchmark
   - name: Linux_mokey fading_child_animation_perf__timeline_summary
     recipe: devicelab/devicelab_drone