From a138fbe1e0c1f4e4c9ae200cac33744913ccf45f Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:46:53 -0700
Subject: [PATCH] Remove Android API v33 tests from CI. (flutter/engine#51751)

Closes https://github.com/flutter/flutter/issues/144064.

From a conversation with @camsim99 on Discord:

> Ah this was to debug that missing emulator issue (https://github.com/flutter/flutter/issues/137947) that Ricardo and I were seeing. We wanted to see if it was specific to the API 34, and if so, escalate the issue internally. @ricardoamador Would you like to keep running the tests with API 33? You mentioned you have found a workaround, and the test runs seem to not have yielded any evidence against API 34.
---
 engine/src/flutter/.ci.yaml                   | 23 -----
 .../linux_android_emulator_api_33.json        | 88 -------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 engine/src/flutter/ci/builders/linux_android_emulator_api_33.json

diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index 181c70b00f4..022c0770518 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -89,29 +89,6 @@ targets:
       - testing/scenario_app/**
       - testing/skia_gold_client/**
 
-# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
-# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
-  - name: Linux linux_android_emulator_tests_api_33
-    bringup: true
-    enabled_branches:
-      - main
-    recipe: engine_v2/engine_v2
-    properties:
-      config_name: linux_android_emulator_api_33
-      dependencies: >-
-        [
-          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
-        ]
-    timeout: 60
-    runIf:
-      - .ci.yaml
-      - ci/builders/linux_android_emulator_api_33.json
-      - DEPS
-      - lib/ui/**
-      - shell/platform/android/**
-      - testing/scenario_app/**
-      - testing/skia_gold_client/**
-
   - name: Linux builder_cache
     enabled_branches:
       - main
diff --git a/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json b/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json
deleted file mode 100644
index 7f02655523c..00000000000
--- a/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "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_debug_api33_x64"
-            ],
-            "dependencies": [
-                {
-                    "dependency": "goldctl",
-                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
-                }
-            ],
-            "name": "android_debug_api33_x64",
-            "ninja": {
-                "config": "android_debug_api33_x64",
-                "targets": [
-                    "flutter/impeller/toolkit/android:unittests",
-                    "flutter/shell/platform/android:flutter_shell_native_unittests",
-                    "flutter/testing/scenario_app"
-                ]
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Android Unit Tests",
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_33_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8759428741582061553"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--android-variant",
-                        "android_debug_api33_x64",
-                        "--type",
-                        "android"
-                    ]
-                },
-                {
-                    "language": "dart",
-                    "name": "Scenario App Integration Tests",
-                    "test_timeout_secs": 900,
-                    "max_attempts": 1,
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_33_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_debug_api33_x64"
-                    ]
-                }
-            ]
-        }
-    ]
-}