flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-06-30 14:47:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Introduces API 34 emulators for subset of tests (#5105)

Browse Source 
Introduces API 34 emulators for subset of tests not causing test failures in https://github.com/flutter/packages/pull/4804. Also changes linux_android version to 34v1.

Continuation of https://github.com/flutter/packages/pull/4820.
This commit is contained in:
Camille Simon
2023-10-24 17:25:52 +00:00
committed by GitHub
parent a0ed43580e
commit 3cc6e26ea8
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
.ci.yaml
View File

@ -271,7 +271,7 @@ targets:
# web_benchmarks needs Chrome. # web_benchmarks needs Chrome.
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"}, {"dependency": "android_virtual_device", "version": "34"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"} {"dependency": "chrome_and_driver", "version": "version:114.0"}
] ]
@ -288,7 +288,7 @@ targets:
# See comments on 'master' version above. # See comments on 'master' version above.
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"}, {"dependency": "android_virtual_device", "version": "34"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"} {"dependency": "chrome_and_driver", "version": "version:114.0"}
] ]
@ -323,6 +323,9 @@ targets:
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:11"}
] ]
# All of the Linux_android android_platform_tests shards have the same
# dependency list, despite some running on Android 33 AVDs versus 34.
# See https://github.com/flutter/flutter/issues/137082 for context.
- name: Linux_android android_platform_tests_shard_1 master - name: Linux_android android_platform_tests_shard_1 master
recipe: packages/packages recipe: packages/packages
timeout: 60 timeout: 60
@ -330,10 +333,11 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 0 --shardCount 6" package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_2 master - name: Linux_android android_platform_tests_shard_2 master
@ -343,10 +347,11 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 1 --shardCount 6" package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_3 master - name: Linux_android android_platform_tests_shard_3 master
@ -356,10 +361,11 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 2 --shardCount 6" package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_4 master - name: Linux_android android_platform_tests_shard_4 master
@ -369,10 +375,11 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 3 --shardCount 6" package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_5 master - name: Linux_android android_platform_tests_shard_5 master
@ -382,10 +389,11 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 4 --shardCount 6" package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_6 master - name: Linux_android android_platform_tests_shard_6 master
@ -395,20 +403,21 @@ targets:
target_file: android_platform_tests.yaml target_file: android_platform_tests.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 34
package_sharding: "--shardIndex 5 --shardCount 6" package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_api_33_shard_1 master - name: Linux_android android_platform_tests_api_33_shard_1 master
recipe: packages/packages recipe: packages/packages
timeout: 60 timeout: 60
bringup: true
properties: properties:
target_file: android_platform_tests_api_33.yaml target_file: android_platform_tests_api_33_avd.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 33
package_sharding: "--shardIndex 0 --shardCount 2" package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >- dependencies: >-
[ [
@ -418,11 +427,11 @@ targets:
- name: Linux_android android_platform_tests_api_33_shard_2 master - name: Linux_android android_platform_tests_api_33_shard_2 master
recipe: packages/packages recipe: packages/packages
timeout: 60 timeout: 60
bringup: true
properties: properties:
target_file: android_platform_tests_api_33.yaml target_file: android_platform_tests_api_33_avd.yaml
channel: master channel: master
version_file: flutter_master.version version_file: flutter_master.version
# set up for 33
package_sharding: "--shardIndex 1 --shardCount 2" package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >- dependencies: >-
[ [
@ -440,7 +449,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 6" package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_2 stable - name: Linux_android android_platform_tests_shard_2 stable
@ -454,7 +463,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 6" package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_3 stable - name: Linux_android android_platform_tests_shard_3 stable
@ -468,7 +477,7 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 6" package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_4 stable - name: Linux_android android_platform_tests_shard_4 stable
@ -482,7 +491,7 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 6" package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_5 stable - name: Linux_android android_platform_tests_shard_5 stable
@ -496,7 +505,7 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 6" package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_shard_6 stable - name: Linux_android android_platform_tests_shard_6 stable
@ -510,15 +519,14 @@ targets:
package_sharding: "--shardIndex 5 --shardCount 6" package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"} {"dependency": "android_virtual_device", "version": "34"}
] ]
- name: Linux_android android_platform_tests_api_33_shard_1 stable - name: Linux_android android_platform_tests_api_33_shard_1 stable
recipe: packages/packages recipe: packages/packages
timeout: 60 timeout: 60
bringup: true
properties: properties:
target_file: android_platform_tests_api_33.yaml target_file: android_platform_tests_api_33_avd.yaml
channel: master channel: master
version_file: flutter_stable.version version_file: flutter_stable.version
package_sharding: "--shardIndex 0 --shardCount 2" package_sharding: "--shardIndex 0 --shardCount 2"
@ -530,9 +538,8 @@ targets:
- name: Linux_android android_platform_tests_api_33_shard_2 stable - name: Linux_android android_platform_tests_api_33_shard_2 stable
recipe: packages/packages recipe: packages/packages
timeout: 60 timeout: 60
bringup: true
properties: properties:
target_file: android_platform_tests_api_33.yaml target_file: android_platform_tests_api_33_avd.yaml
channel: master channel: master
version_file: flutter_stable.version version_file: flutter_stable.version
package_sharding: "--shardIndex 1 --shardCount 2" package_sharding: "--shardIndex 1 --shardCount 2"

12
.ci/targets/android_platform_tests.yaml
View File

@ -5,23 +5,23 @@ tasks:
- name: download Dart and Android deps - name: download Dart and Android deps
script: script/tool_runner.sh script: script/tool_runner.sh
infra_step: true infra_step: true
args: ["fetch-deps", "--android", "--supporting-target-platforms-only"] args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
- name: build examples - name: build examples
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["build-examples", "--apk"] args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
- name: lint - name: lint
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["lint-android"] args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
# Native unit and native integration are split into two steps to allow for # Native unit and native integration are split into two steps to allow for
# different exclusions. # different exclusions.
# TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
# these steps. # these steps.
- name: native unit tests - name: native unit tests
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"] args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
- name: native integration tests - name: native integration tests
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["native-test", "--android", "--no-unit"] args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
- name: drive examples - name: drive examples
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"] 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"]

4
.ci/targets/android_platform_tests_api_33_avd.yaml
View File

@ -20,11 +20,11 @@ tasks:
# these steps. # these steps.
- name: native unit tests - name: native unit tests
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["native-test", "--android", "--no-integration", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"] 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"]
- name: native integration tests - name: native integration tests
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"] args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
- name: drive examples - name: drive examples
script: script/tool_runner.sh script: script/tool_runner.sh
args: ["drive-examples", "--android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"] 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"]

1
script/configs/still_requires_api_33_avd.yaml
View File

@ -2,3 +2,4 @@
- file_selector - file_selector
- quick_actions - quick_actions
- webview_flutter - webview_flutter
- path_provider