[pigeon] Enable Android emulator tests in CI (#4484)

Enables the new emulator support for the Linux custom package test targets, and enables the emulator-based Android integration tests for Pigeon.

Drops the cores from the high-core config (32) to the default (8) since the emulator requires KVM, and there are currently no 32-core KVM machines in the pool. In practice, it appears that this doesn't have much affect on the runtime.

Fixes https://github.com/flutter/flutter/issues/111505
This commit is contained in:
stuartmorgan
2023-07-17 19:12:57 -04:00
committed by GitHub
parent c4a57a029a
commit d4d761b74c
2 changed files with 10 additions and 10 deletions

View File

@ -239,15 +239,18 @@ targets:
- name: Linux_android custom_package_tests master - name: Linux_android custom_package_tests master
recipe: packages/packages recipe: packages/packages
timeout: 30 timeout: 30
dimensions:
kvm: "1"
properties: properties:
add_recipes_cq: "true" add_recipes_cq: "true"
version_file: flutter_master.version version_file: flutter_master.version
target_file: linux_custom_package_tests.yaml target_file: linux_custom_package_tests.yaml
# Pigeon tests need Andoid deps (thus the Linux_android base) and # Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
# clang-format. # and clang-format.
# web_benchmarks needs Chrome. # web_benchmarks needs Chrome.
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"},
{"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"}
] ]
@ -256,12 +259,15 @@ targets:
- name: Linux_android custom_package_tests stable - name: Linux_android custom_package_tests stable
recipe: packages/packages recipe: packages/packages
timeout: 30 timeout: 30
dimensions:
kvm: "1"
properties: properties:
version_file: flutter_stable.version version_file: flutter_stable.version
target_file: linux_custom_package_tests.yaml target_file: linux_custom_package_tests.yaml
# See comments on 'master' version above. # See comments on 'master' version above.
dependencies: >- dependencies: >-
[ [
{"dependency": "android_virtual_device", "version": "33"},
{"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"}
] ]

View File

@ -167,11 +167,8 @@ Future<void> main(List<String> args) async {
androidJavaUnitTests, androidJavaUnitTests,
androidJavaLint, androidJavaLint,
androidKotlinUnitTests, androidKotlinUnitTests,
// TODO(stuartmorgan): Include these once CI supports running simulator androidJavaIntegrationTests,
// tests. Currently these tests aren't run in CI. androidKotlinIntegrationTests,
// See https://github.com/flutter/flutter/issues/111505.
// androidJavaIntegrationTests,
// androidKotlinIntegrationTests,
]; ];
const List<String> macOSHostTests = <String>[ const List<String> macOSHostTests = <String>[
iOSObjCUnitTests, iOSObjCUnitTests,
@ -198,9 +195,6 @@ Future<void> main(List<String> args) async {
windowsHostTests, windowsHostTests,
// Tests that are deliberately not included in CI: // Tests that are deliberately not included in CI:
<String>[ <String>[
// See comment in linuxHostTests:
androidJavaIntegrationTests,
androidKotlinIntegrationTests,
// See comments in macOSHostTests: // See comments in macOSHostTests:
iOSObjCIntegrationTests, iOSObjCIntegrationTests,
iOSSwiftIntegrationTests, iOSSwiftIntegrationTests,