Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b877e89

Browse files
camsim99camsim99
authored
[Android] Update integration test AVD dependency to use Android 35 emulators (#54186)
Updates AVD dependency to use [latest available AVD dependency](https://chrome-infra-packages.appspot.com/p/chromium/tools/android/avd/linux-amd64/+/I7SIawD0okHpiEe8fKvI5NQrMEWDibsvOduVbbK5pDEC) (older at the time of publishing but the same I set in the framework -- flutter/flutter#152498) so that engine integration tests run on emulators running Android 35, the current latest version of Android. Does not change dependency of one test that is intended to run on Android 28. Also adds tasks to run the same emulator tests on those running Android 34 since Android 35 emulators seem to crash off and on. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 8bc8111 commit b877e89

File tree

5 files changed

+313
-22
lines changed

5 files changed

+313
-22
lines changed

‎.ci.yaml‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ platform_properties:
4545
device_type: none
4646
os: Windows-10
4747

48-
# The current android emulator config names can be found here:
49-
# https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
50-
# You may use those names for the android_virtual_device version.
5148
targets:
5249
- name: Linux local_engine_builds
5350
enabled_branches:
@@ -57,6 +54,7 @@ targets:
5754
config_name: local_engine
5855

5956
- name: Linux linux_android_emulator_tests
57+
bringup: true
6058
enabled_branches:
6159
- main
6260
recipe: engine_v2/engine_v2
@@ -76,7 +74,29 @@ targets:
7674
- testing/scenario_app/**
7775
- testing/skia_gold_client/**
7876

77+
- name: Linux linux_android_emulator_tests_34
78+
bringup: true
79+
enabled_branches:
80+
- main
81+
recipe: engine_v2/engine_v2
82+
properties:
83+
config_name: linux_android_emulator_34
84+
dependencies: >-
85+
[
86+
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
87+
]
88+
timeout: 90
89+
runIf:
90+
- .ci.yaml
91+
- ci/builders/linux_android_emulator.json
92+
- DEPS
93+
- lib/ui/**
94+
- shell/platform/android/**
95+
- testing/scenario_app/**
96+
- testing/skia_gold_client/**
97+
7998
- name: Linux linux_android_emulator_skia_tests
99+
bringup: true
80100
enabled_branches:
81101
- main
82102
recipe: engine_v2/engine_v2
@@ -96,6 +116,27 @@ targets:
96116
- testing/scenario_app/**
97117
- testing/skia_gold_client/**
98118

119+
- name: Linux linux_android_emulator_skia_tests_34
120+
bringup: true
121+
enabled_branches:
122+
- main
123+
recipe: engine_v2/engine_v2
124+
properties:
125+
config_name: linux_android_emulator_skia_34
126+
dependencies: >-
127+
[
128+
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
129+
]
130+
timeout: 90
131+
runIf:
132+
- .ci.yaml
133+
- ci/builders/linux_android_emulator.json
134+
- DEPS
135+
- lib/ui/**
136+
- shell/platform/android/**
137+
- testing/scenario_app/**
138+
- testing/skia_gold_client/**
139+
99140
- name: Linux builder_cache
100141
enabled_branches:
101142
- main

‎ci/builders/linux_android_emulator.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@
4242
"test_dependencies": [
4343
{
4444
"dependency": "android_virtual_device",
45-
"version": "android_34_google_apis_x64.textpb"
45+
"version": "android_35_google_apis_x64.textpb"
4646
},
4747
{
4848
"dependency": "avd_cipd_version",
49-
"version": "build_id:8759428741582061553"
49+
"version": "build_id:8740267484269553649"
5050
}
5151
],
5252
"contexts": [
5353
"android_virtual_device"
5454
],
5555
"script": "flutter/testing/run_tests.py",
5656
"parameters": [
57-
"--android-variant",
58-
"ci/android_emulator_debug_x64",
59-
"--type",
60-
"android"
57+
"--android-variant",
58+
"ci/android_emulator_debug_x64",
59+
"--type",
60+
"android"
6161
]
6262
},
6363
{
@@ -74,11 +74,11 @@
7474
"test_dependencies": [
7575
{
7676
"dependency": "android_virtual_device",
77-
"version": "android_34_google_apis_x64.textpb"
77+
"version": "android_35_google_apis_x64.textpb"
7878
},
7979
{
8080
"dependency": "avd_cipd_version",
81-
"version": "build_id:8759428741582061553"
81+
"version": "build_id:8740267484269553649"
8282
}
8383
],
8484
"contexts": [
@@ -139,21 +139,21 @@
139139
},
140140
{
141141
"dependency": "avd_cipd_version",
142-
"version": "build_id:8759428741582061553"
142+
"version": "build_id:8740267484269553649"
143143
}
144144
],
145145
"contexts": [
146146
"android_virtual_device"
147147
],
148148
"script": "flutter/testing/run_tests.py",
149149
"parameters": [
150-
"--android-variant",
151-
"ci/android_emulator_debug_x86",
152-
"--type",
153-
"android"
150+
"--android-variant",
151+
"ci/android_emulator_debug_x86",
152+
"--type",
153+
"android"
154154
]
155155
}
156156
]
157157
}
158158
]
159-
}
159+
}

‎ci/builders/linux_android_emulator_34.json‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
{
2+
"builds": [
3+
{
4+
"drone_dimensions": [
5+
"device_type=none",
6+
"os=Linux",
7+
"kvm=1",
8+
"cores=8"
9+
],
10+
"gclient_variables": {
11+
"use_rbe": true
12+
},
13+
"gn": [
14+
"--android",
15+
"--android-cpu=x64",
16+
"--no-lto",
17+
"--rbe",
18+
"--no-goma",
19+
"--target-dir",
20+
"ci/android_emulator_debug_x64"
21+
],
22+
"dependencies": [
23+
{
24+
"dependency": "goldctl",
25+
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
26+
}
27+
],
28+
"name": "ci/android_emulator_debug_x64",
29+
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app tests.",
30+
"ninja": {
31+
"config": "ci/android_emulator_debug_x64",
32+
"targets": [
33+
"flutter/impeller/toolkit/android:unittests",
34+
"flutter/shell/platform/android:flutter_shell_native_unittests",
35+
"flutter/testing/scenario_app"
36+
]
37+
},
38+
"tests": [
39+
{
40+
"language": "python3",
41+
"name": "Android Unit Tests",
42+
"test_dependencies": [
43+
{
44+
"dependency": "android_virtual_device",
45+
"version": "android_34_google_apis_x64.textpb"
46+
},
47+
{
48+
"dependency": "avd_cipd_version",
49+
"version": "build_id:8740267484269553649"
50+
}
51+
],
52+
"contexts": [
53+
"android_virtual_device"
54+
],
55+
"script": "flutter/testing/run_tests.py",
56+
"parameters": [
57+
"--android-variant",
58+
"ci/android_emulator_debug_x64",
59+
"--type",
60+
"android"
61+
]
62+
},
63+
{
64+
"language": "dart",
65+
"name": "skia_gold_client/e2e_test",
66+
"script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
67+
"max_attempts": 1
68+
},
69+
{
70+
"language": "dart",
71+
"name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
72+
"test_timeout_secs": 900,
73+
"max_attempts": 2,
74+
"test_dependencies": [
75+
{
76+
"dependency": "android_virtual_device",
77+
"version": "android_34_google_apis_x64.textpb"
78+
},
79+
{
80+
"dependency": "avd_cipd_version",
81+
"version": "build_id:8740267484269553649"
82+
}
83+
],
84+
"contexts": [
85+
"android_virtual_device"
86+
],
87+
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
88+
"parameters": [
89+
"--out-dir=../out/ci/android_emulator_debug_x64",
90+
"--enable-impeller",
91+
"--impeller-backend=vulkan"
92+
]
93+
}
94+
]
95+
},
96+
{
97+
"drone_dimensions": [
98+
"device_type=none",
99+
"os=Linux",
100+
"kvm=1",
101+
"cores=8"
102+
],
103+
"gclient_variables": {
104+
"use_rbe": true
105+
},
106+
"gn": [
107+
"--android",
108+
"--android-cpu=x86",
109+
"--no-lto",
110+
"--rbe",
111+
"--no-goma",
112+
"--target-dir",
113+
"ci/android_emulator_debug_x86"
114+
],
115+
"dependencies": [
116+
{
117+
"dependency": "goldctl",
118+
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
119+
}
120+
],
121+
"name": "ci/android_emulator_debug_x86",
122+
"description": "Build for debug mode x86 Android emulator tests.",
123+
"ninja": {
124+
"config": "ci/android_emulator_debug_x86",
125+
"targets": [
126+
"flutter/impeller/toolkit/android:unittests",
127+
"flutter/shell/platform/android:flutter_shell_native_unittests",
128+
"flutter/testing/scenario_app"
129+
]
130+
},
131+
"tests": [
132+
{
133+
"language": "python3",
134+
"name": "Android Unit Tests (API 28)",
135+
"test_dependencies": [
136+
{
137+
"dependency": "android_virtual_device",
138+
"version": "android_28_google_apis_x86.textpb"
139+
},
140+
{
141+
"dependency": "avd_cipd_version",
142+
"version": "build_id:8740267484269553649"
143+
}
144+
],
145+
"contexts": [
146+
"android_virtual_device"
147+
],
148+
"script": "flutter/testing/run_tests.py",
149+
"parameters": [
150+
"--android-variant",
151+
"ci/android_emulator_debug_x86",
152+
"--type",
153+
"android"
154+
]
155+
}
156+
]
157+
}
158+
]
159+
}

‎ci/builders/linux_android_emulator_skia.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
"test_dependencies": [
4545
{
4646
"dependency": "android_virtual_device",
47-
"version": "android_34_google_apis_x64.textpb"
47+
"version": "android_35_google_apis_x64.textpb"
4848
},
4949
{
5050
"dependency": "avd_cipd_version",
51-
"version": "build_id:8759428741582061553"
51+
"version": "build_id:8740267484269553649"
5252
}
5353
],
5454
"contexts": [
@@ -68,11 +68,11 @@
6868
"test_dependencies": [
6969
{
7070
"dependency": "android_virtual_device",
71-
"version": "android_34_google_apis_x64.textpb"
71+
"version": "android_35_google_apis_x64.textpb"
7272
},
7373
{
7474
"dependency": "avd_cipd_version",
75-
"version": "build_id:8759428741582061553"
75+
"version": "build_id:8740267484269553649"
7676
}
7777
],
7878
"contexts": [
@@ -88,4 +88,4 @@
8888
]
8989
}
9090
]
91-
}
91+
}

0 commit comments

Comments
 (0)