Skip to content

Commit 3cc6e26

Browse files
authored
[Android] Introduces API 34 emulators for subset of tests (#5105)
Introduces API 34 emulators for subset of tests not causing test failures in #4804. Also changes linux_android version to 34v1. Continuation of #4820.
1 parent a0ed435 commit 3cc6e26

File tree

4 files changed

+38
-30
lines changed

4 files changed

+38
-30
lines changed

.ci.yaml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ targets:
271271
# web_benchmarks needs Chrome.
272272
dependencies: >-
273273
[
274-
{"dependency": "android_virtual_device", "version": "33"},
274+
{"dependency": "android_virtual_device", "version": "34"},
275275
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
276276
{"dependency": "chrome_and_driver", "version": "version:114.0"}
277277
]
@@ -288,7 +288,7 @@ targets:
288288
# See comments on 'master' version above.
289289
dependencies: >-
290290
[
291-
{"dependency": "android_virtual_device", "version": "33"},
291+
{"dependency": "android_virtual_device", "version": "34"},
292292
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
293293
{"dependency": "chrome_and_driver", "version": "version:114.0"}
294294
]
@@ -323,17 +323,21 @@ targets:
323323
{"dependency": "open_jdk", "version": "version:11"}
324324
]
325325
326+
# All of the Linux_android android_platform_tests shards have the same
327+
# dependency list, despite some running on Android 33 AVDs versus 34.
328+
# See https://github.com/flutter/flutter/issues/137082 for context.
326329
- name: Linux_android android_platform_tests_shard_1 master
327330
recipe: packages/packages
328331
timeout: 60
329332
properties:
330333
target_file: android_platform_tests.yaml
331334
channel: master
332335
version_file: flutter_master.version
336+
# set up for 34
333337
package_sharding: "--shardIndex 0 --shardCount 6"
334338
dependencies: >-
335339
[
336-
{"dependency": "android_virtual_device", "version": "33"}
340+
{"dependency": "android_virtual_device", "version": "34"}
337341
]
338342
339343
- name: Linux_android android_platform_tests_shard_2 master
@@ -343,10 +347,11 @@ targets:
343347
target_file: android_platform_tests.yaml
344348
channel: master
345349
version_file: flutter_master.version
350+
# set up for 34
346351
package_sharding: "--shardIndex 1 --shardCount 6"
347352
dependencies: >-
348353
[
349-
{"dependency": "android_virtual_device", "version": "33"}
354+
{"dependency": "android_virtual_device", "version": "34"}
350355
]
351356
352357
- name: Linux_android android_platform_tests_shard_3 master
@@ -356,10 +361,11 @@ targets:
356361
target_file: android_platform_tests.yaml
357362
channel: master
358363
version_file: flutter_master.version
364+
# set up for 34
359365
package_sharding: "--shardIndex 2 --shardCount 6"
360366
dependencies: >-
361367
[
362-
{"dependency": "android_virtual_device", "version": "33"}
368+
{"dependency": "android_virtual_device", "version": "34"}
363369
]
364370
365371
- name: Linux_android android_platform_tests_shard_4 master
@@ -369,10 +375,11 @@ targets:
369375
target_file: android_platform_tests.yaml
370376
channel: master
371377
version_file: flutter_master.version
378+
# set up for 34
372379
package_sharding: "--shardIndex 3 --shardCount 6"
373380
dependencies: >-
374381
[
375-
{"dependency": "android_virtual_device", "version": "33"}
382+
{"dependency": "android_virtual_device", "version": "34"}
376383
]
377384
378385
- name: Linux_android android_platform_tests_shard_5 master
@@ -382,10 +389,11 @@ targets:
382389
target_file: android_platform_tests.yaml
383390
channel: master
384391
version_file: flutter_master.version
392+
# set up for 34
385393
package_sharding: "--shardIndex 4 --shardCount 6"
386394
dependencies: >-
387395
[
388-
{"dependency": "android_virtual_device", "version": "33"}
396+
{"dependency": "android_virtual_device", "version": "34"}
389397
]
390398
391399
- name: Linux_android android_platform_tests_shard_6 master
@@ -395,20 +403,21 @@ targets:
395403
target_file: android_platform_tests.yaml
396404
channel: master
397405
version_file: flutter_master.version
406+
# set up for 34
398407
package_sharding: "--shardIndex 5 --shardCount 6"
399408
dependencies: >-
400409
[
401-
{"dependency": "android_virtual_device", "version": "33"}
410+
{"dependency": "android_virtual_device", "version": "34"}
402411
]
403412
404413
- name: Linux_android android_platform_tests_api_33_shard_1 master
405414
recipe: packages/packages
406415
timeout: 60
407-
bringup: true
408416
properties:
409-
target_file: android_platform_tests_api_33.yaml
417+
target_file: android_platform_tests_api_33_avd.yaml
410418
channel: master
411419
version_file: flutter_master.version
420+
# set up for 33
412421
package_sharding: "--shardIndex 0 --shardCount 2"
413422
dependencies: >-
414423
[
@@ -418,11 +427,11 @@ targets:
418427
- name: Linux_android android_platform_tests_api_33_shard_2 master
419428
recipe: packages/packages
420429
timeout: 60
421-
bringup: true
422430
properties:
423-
target_file: android_platform_tests_api_33.yaml
431+
target_file: android_platform_tests_api_33_avd.yaml
424432
channel: master
425433
version_file: flutter_master.version
434+
# set up for 33
426435
package_sharding: "--shardIndex 1 --shardCount 2"
427436
dependencies: >-
428437
[
@@ -440,7 +449,7 @@ targets:
440449
package_sharding: "--shardIndex 0 --shardCount 6"
441450
dependencies: >-
442451
[
443-
{"dependency": "android_virtual_device", "version": "33"}
452+
{"dependency": "android_virtual_device", "version": "34"}
444453
]
445454
446455
- name: Linux_android android_platform_tests_shard_2 stable
@@ -454,7 +463,7 @@ targets:
454463
package_sharding: "--shardIndex 1 --shardCount 6"
455464
dependencies: >-
456465
[
457-
{"dependency": "android_virtual_device", "version": "33"}
466+
{"dependency": "android_virtual_device", "version": "34"}
458467
]
459468
460469
- name: Linux_android android_platform_tests_shard_3 stable
@@ -468,7 +477,7 @@ targets:
468477
package_sharding: "--shardIndex 2 --shardCount 6"
469478
dependencies: >-
470479
[
471-
{"dependency": "android_virtual_device", "version": "33"}
480+
{"dependency": "android_virtual_device", "version": "34"}
472481
]
473482
474483
- name: Linux_android android_platform_tests_shard_4 stable
@@ -482,7 +491,7 @@ targets:
482491
package_sharding: "--shardIndex 3 --shardCount 6"
483492
dependencies: >-
484493
[
485-
{"dependency": "android_virtual_device", "version": "33"}
494+
{"dependency": "android_virtual_device", "version": "34"}
486495
]
487496
488497
- name: Linux_android android_platform_tests_shard_5 stable
@@ -496,7 +505,7 @@ targets:
496505
package_sharding: "--shardIndex 4 --shardCount 6"
497506
dependencies: >-
498507
[
499-
{"dependency": "android_virtual_device", "version": "33"}
508+
{"dependency": "android_virtual_device", "version": "34"}
500509
]
501510
502511
- name: Linux_android android_platform_tests_shard_6 stable
@@ -510,15 +519,14 @@ targets:
510519
package_sharding: "--shardIndex 5 --shardCount 6"
511520
dependencies: >-
512521
[
513-
{"dependency": "android_virtual_device", "version": "33"}
522+
{"dependency": "android_virtual_device", "version": "34"}
514523
]
515524
516525
- name: Linux_android android_platform_tests_api_33_shard_1 stable
517526
recipe: packages/packages
518527
timeout: 60
519-
bringup: true
520528
properties:
521-
target_file: android_platform_tests_api_33.yaml
529+
target_file: android_platform_tests_api_33_avd.yaml
522530
channel: master
523531
version_file: flutter_stable.version
524532
package_sharding: "--shardIndex 0 --shardCount 2"
@@ -530,9 +538,8 @@ targets:
530538
- name: Linux_android android_platform_tests_api_33_shard_2 stable
531539
recipe: packages/packages
532540
timeout: 60
533-
bringup: true
534541
properties:
535-
target_file: android_platform_tests_api_33.yaml
542+
target_file: android_platform_tests_api_33_avd.yaml
536543
channel: master
537544
version_file: flutter_stable.version
538545
package_sharding: "--shardIndex 1 --shardCount 2"

.ci/targets/android_platform_tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ tasks:
55
- name: download Dart and Android deps
66
script: script/tool_runner.sh
77
infra_step: true
8-
args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
8+
args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
99
- name: build examples
1010
script: script/tool_runner.sh
11-
args: ["build-examples", "--apk"]
11+
args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
1212
- name: lint
1313
script: script/tool_runner.sh
14-
args: ["lint-android"]
14+
args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
1515
# Native unit and native integration are split into two steps to allow for
1616
# different exclusions.
1717
# TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
1818
# these steps.
1919
- name: native unit tests
2020
script: script/tool_runner.sh
21-
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
21+
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
2222
- name: native integration tests
2323
script: script/tool_runner.sh
24-
args: ["native-test", "--android", "--no-unit"]
24+
args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
2525
- name: drive examples
2626
script: script/tool_runner.sh
27-
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
27+
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]

.ci/targets/android_platform_tests_api_33_avd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ tasks:
2020
# these steps.
2121
- name: native unit tests
2222
script: script/tool_runner.sh
23-
args: ["native-test", "--android", "--no-integration", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
23+
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
2424
- name: native integration tests
2525
script: script/tool_runner.sh
2626
args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
2727
- name: drive examples
2828
script: script/tool_runner.sh
29-
args: ["drive-examples", "--android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
29+
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
3030

script/configs/still_requires_api_33_avd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
- file_selector
33
- quick_actions
44
- webview_flutter
5+
- path_provider

0 commit comments

Comments
 (0)