diff --git a/.ci.yaml b/.ci.yaml index 181c70b00f491..022c07705186f 100644 --- a/.ci.yaml +++ b/.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/ci/builders/linux_android_emulator_api_33.json b/ci/builders/linux_android_emulator_api_33.json deleted file mode 100644 index 7f02655523cdd..0000000000000 --- a/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" - ] - } - ] - } - ] -}