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

[Android] Update integration test AVD dependency to use Android 35 emulators #54186

Merged
merged 48 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
03266f1
Make base engine changes
camsim99 Jun 25, 2024
10e169b
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jun 28, 2024
7ca603d
Correct 35 version
camsim99 Jun 28, 2024
8c0e538
compileSdk
camsim99 Jun 28, 2024
291cb41
Undo packages + change for test
camsim99 Jul 1, 2024
65d90a9
format
camsim99 Jul 1, 2024
e317ce4
Change back to 35
camsim99 Jul 1, 2024
5ce0a8d
format
camsim99 Jul 1, 2024
9b01ee7
Test with buildroot changes
camsim99 Jul 1, 2024
3e09995
Update 35 version to 35v1
camsim99 Jul 10, 2024
7ff2d27
Update impeller test
camsim99 Jul 10, 2024
b530500
Correct Imepller version
camsim99 Jul 10, 2024
35265f8
Test correct root
camsim99 Jul 10, 2024
380766e
Another impeller update
camsim99 Jul 10, 2024
a9b171c
Correct build tools version
camsim99 Jul 10, 2024
d5963e2
Bump target version
camsim99 Jul 10, 2024
ea34633
Bump test runner AGP version
camsim99 Jul 11, 2024
380d49d
bump manifest target
camsim99 Jul 15, 2024
5961681
deps
camsim99 Jul 16, 2024
32339a9
Suppress deprecations
camsim99 Jul 17, 2024
1f07cd8
Undo added code
camsim99 Jul 18, 2024
1aec7b3
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 18, 2024
a8e44ac
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 18, 2024
d3b8f43
Update AGP, update packages.txt, remove unneeded test case
camsim99 Jul 19, 2024
645d8d2
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 19, 2024
77bf104
what is src dir
camsim99 Jul 19, 2024
53ee46d
Correct directory
camsim99 Jul 22, 2024
ca1611b
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 22, 2024
8edba5f
Merge branch 'main' into eng_35
camsim99 Jul 23, 2024
7fecb2a
Update buildroot commit
camsim99 Jul 23, 2024
ff12cf4
Merge remote-tracking branch 'refs/remotes/origin/eng_35' into eng_35
camsim99 Jul 23, 2024
7d37adc
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 23, 2024
7adc7b8
Temporarily undo deps change
camsim99 Jul 23, 2024
1635d85
Update DEPS entry
camsim99 Jul 23, 2024
5e58cf9
Update android_virtual_device dep
camsim99 Jul 29, 2024
09b92f5
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 29, 2024
6e53eff
Removed irrelevant comment, try --no-stripped
camsim99 Jul 30, 2024
595fc22
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 31, 2024
cc7063f
remove no-stripped
camsim99 Jul 31, 2024
140ca2a
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Jul 31, 2024
44d2bcf
Run test workaround
camsim99 Aug 1, 2024
99e01cc
Undo screenshotutil changes
camsim99 Aug 5, 2024
9bcb2e5
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 Aug 5, 2024
4fe82e6
Merge branch 'main' into eng_35
camsim99 Aug 6, 2024
491fe12
Update avd package
camsim99 Aug 8, 2024
f488e97
Merge remote-tracking branch 'refs/remotes/origin/eng_35' into eng_35
camsim99 Aug 8, 2024
f292c02
Add 34 targets
camsim99 Aug 12, 2024
695d915
Mark 35 tests flaky
camsim99 Aug 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ platform_properties:
device_type: none
os: Windows-10

# The current android emulator config names can be found here:
# https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
# You may use those names for the android_virtual_device version.
targets:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this comment because android_virtual_device is not even referenced here and updated documentation about upgrading this dependency will land with flutter/flutter#151601.

- name: Linux local_engine_builds
enabled_branches:
Expand All @@ -57,6 +54,7 @@ targets:
config_name: local_engine

- name: Linux linux_android_emulator_tests
bringup: true
enabled_branches:
- main
recipe: engine_v2/engine_v2
Expand All @@ -76,7 +74,29 @@ targets:
- testing/scenario_app/**
- testing/skia_gold_client/**

- name: Linux linux_android_emulator_tests_34
bringup: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be on the safe side, I'd suggest also shifting the the tests that will now be running on the 35 image to bringup as well.

Otherwise, lgtm.

enabled_branches:
- main
recipe: engine_v2/engine_v2
properties:
config_name: linux_android_emulator_34
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- .ci.yaml
- ci/builders/linux_android_emulator.json
- DEPS
- lib/ui/**
- shell/platform/android/**
- testing/scenario_app/**
- testing/skia_gold_client/**

- name: Linux linux_android_emulator_skia_tests
bringup: true
enabled_branches:
- main
recipe: engine_v2/engine_v2
Expand All @@ -96,6 +116,27 @@ targets:
- testing/scenario_app/**
- testing/skia_gold_client/**

- name: Linux linux_android_emulator_skia_tests_34
bringup: true
enabled_branches:
- main
recipe: engine_v2/engine_v2
properties:
config_name: linux_android_emulator_skia_34
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- .ci.yaml
- ci/builders/linux_android_emulator.json
- DEPS
- lib/ui/**
- shell/platform/android/**
- testing/scenario_app/**
- testing/skia_gold_client/**

- name: Linux builder_cache
enabled_branches:
- main
Expand Down
28 changes: 14 additions & 14 deletions ci/builders/linux_android_emulator.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
"version": "android_35_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8759428741582061553"
"version": "build_id:8740267484269553649"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/run_tests.py",
"parameters": [
"--android-variant",
"ci/android_emulator_debug_x64",
"--type",
"android"
"--android-variant",
"ci/android_emulator_debug_x64",
"--type",
"android"
]
},
{
Expand All @@ -74,11 +74,11 @@
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
"version": "android_35_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8759428741582061553"
"version": "build_id:8740267484269553649"
}
],
"contexts": [
Expand Down Expand Up @@ -139,21 +139,21 @@
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8759428741582061553"
"version": "build_id:8740267484269553649"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/run_tests.py",
"parameters": [
"--android-variant",
"ci/android_emulator_debug_x86",
"--type",
"android"
"--android-variant",
"ci/android_emulator_debug_x86",
"--type",
"android"
]
}
]
}
]
}
}
159 changes: 159 additions & 0 deletions ci/builders/linux_android_emulator_34.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
{
"builds": [
{
"drone_dimensions": [
"device_type=none",
"os=Linux",
"kvm=1",
"cores=8"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x64",
"--no-lto",
"--rbe",
"--no-goma",
"--target-dir",
"ci/android_emulator_debug_x64"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"name": "ci/android_emulator_debug_x64",
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app tests.",
"ninja": {
"config": "ci/android_emulator_debug_x64",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
]
},
"tests": [
{
"language": "python3",
"name": "Android Unit Tests",
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8740267484269553649"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/run_tests.py",
"parameters": [
"--android-variant",
"ci/android_emulator_debug_x64",
"--type",
"android"
]
},
{
"language": "dart",
"name": "skia_gold_client/e2e_test",
"script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
"max_attempts": 1
},
{
"language": "dart",
"name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
"test_timeout_secs": 900,
"max_attempts": 2,
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8740267484269553649"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
"parameters": [
"--out-dir=../out/ci/android_emulator_debug_x64",
"--enable-impeller",
"--impeller-backend=vulkan"
]
}
]
},
{
"drone_dimensions": [
"device_type=none",
"os=Linux",
"kvm=1",
"cores=8"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x86",
"--no-lto",
"--rbe",
"--no-goma",
"--target-dir",
"ci/android_emulator_debug_x86"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"name": "ci/android_emulator_debug_x86",
"description": "Build for debug mode x86 Android emulator tests.",
"ninja": {
"config": "ci/android_emulator_debug_x86",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
]
},
"tests": [
{
"language": "python3",
"name": "Android Unit Tests (API 28)",
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_28_google_apis_x86.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8740267484269553649"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/run_tests.py",
"parameters": [
"--android-variant",
"ci/android_emulator_debug_x86",
"--type",
"android"
]
}
]
}
]
}
10 changes: 5 additions & 5 deletions ci/builders/linux_android_emulator_skia.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
"version": "android_35_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8759428741582061553"
"version": "build_id:8740267484269553649"
}
],
"contexts": [
Expand All @@ -68,11 +68,11 @@
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
"version": "android_35_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8759428741582061553"
"version": "build_id:8740267484269553649"
}
],
"contexts": [
Expand All @@ -88,4 +88,4 @@
]
}
]
}
}
Loading