From eea2fe77815ea60554a63218b59b15af6e7be0de Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Tue, 19 Nov 2024 10:35:58 -0500 Subject: [PATCH] Deflake api 35 emulator tests by updating emulator definitions version to latest available from chrome infra (#158017) Update to the latest definitions of emulator configurations. Specifically to past https://crrev.com/c/5908894 which added `gpu_mode: "swangle_indirect"` to the api 35 proto. This should help with emulator stability on versions past android 13. Related to b/371020223 Related: https://github.com/flutter/engine/pull/56313 Research notes / my findings for how this system works at go/flutter-android-ci-emulator ## 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] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. --- .ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index df589f42a2..6f1aa0f924 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -51,7 +51,7 @@ platform_properties: [ {"dependency": "android_sdk", "version": "version:35v1"}, {"dependency": "android_virtual_device", "version": "android_35_google_apis_x64.textpb"}, - {"dependency": "avd_cipd_version", "version": "build_id:8735216702926189361"}, + {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}, {"dependency": "open_jdk", "version": "version:17"} ] os: Ubuntu @@ -68,7 +68,7 @@ platform_properties: [ {"dependency": "android_sdk", "version": "version:35v1"}, {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}, - {"dependency": "avd_cipd_version", "version": "build_id:8735216702926189361"}, + {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}, {"dependency": "open_jdk", "version": "version:17"} ] os: Ubuntu @@ -412,7 +412,7 @@ targets: - name: Linux_android_emu android views recipe: devicelab/devicelab_drone - bringup: true # https://github.com/flutter/flutter/issues/153445 + bringup: true properties: tags: > ["framework","hostonly","linux"] @@ -1489,7 +1489,7 @@ targets: - name: Linux_android_emu flutter_driver_android_test recipe: flutter/flutter_drone - bringup: true # https://github.com/flutter/flutter/issues/153445 + bringup: true timeout: 60 properties: shard: flutter_driver_android @@ -2240,7 +2240,7 @@ targets: - name: Linux_android_emu android_defines_test recipe: devicelab/devicelab_drone - bringup: true # https://github.com/flutter/flutter/issues/153445 + bringup: true timeout: 60 properties: tags: > @@ -2653,7 +2653,7 @@ targets: - name: Linux_android_emu external_textures_integration_test recipe: devicelab/devicelab_drone - bringup: true # https://github.com/flutter/flutter/issues/153445 + bringup: true 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