[ci] Switch Android unit tests to LUCI #4406

stuartmorgan · 2023-07-07T18:34:21Z

This moves Android unit tests from Cirrus to LUCI. In order to accomplish this:

Switches the Android LUCI bots from JDK 11 to JDK 12, to resolve a crash when compiling camera_android unit tests with 11.
Adds wrappers to SDK checks where necessary for testability, since the hack to override Build.VERSION.SDK_INT in unit tests (which was already giving warnings when run with JDK 11) no longer works at all in JDK 12.

Enables various new LUCI targets and removes the corresponding Cirrus versions: - The parts of `repo_checks` that have been migrated. - Android platform tests other than FTL. - Web platform tests. Since the Cirrus Android platform tests are now doing less work, the number of shards has been reduced slightly. Part of flutter/flutter#114373

This reverts commit 548e6da.

stuartmorgan · 2023-07-13T02:25:55Z

@reidbaker What do you think of the patterns I'm introducing here?

The background here is that the version of JDK 11 we have available for LUCI has a crash when compiling the camera_android unit tests, and @yusuf-goog wasn't able to find a version of 11 that had the fix, so this updates us to JDK 12 instead. It turns out that the hack we were using in tests to swap out Build.VERSION.SDK_INT in tests completely stopped working in 12+ (in 11 it was giving us "illegal reflection" warnings about how it would be removed in the future; apparently they weren't kidding), so I replaced it with wrappers instead. I'm very open to feedback on how we structure that:

For simple cases I used DI for the wrapper, since I generally think DI is much better than globals. On the other hand, the thing I'm wrapping is already a global, so doing it via a global everywhere is a plausible option.
For camera_android, where it was spread throughout the codebase, I opted for a global, but I could probably DI everything if we want to go that route.
- I also made named helpers, since that's something we'd talked about before; I went back and forth on having the named helpers in the global object, vs the global just being dumb and leaving individual objects to have private named wrappers. In a couple of places we needed the same conceptual check so I opted for centralized, but I don't have strong feelings about it either way.

I'm also definitely open to completely different ways of doing this if you have a preferred pattern.

.ci.yaml

reidbaker · 2023-07-14T17:11:51Z

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java

Great readability improvements.

reidbaker · 2023-07-14T17:17:59Z

...era/camera_android/android/src/main/java/io/flutter/plugins/camera/SdkCapabilityChecker.java

+  public static int SDK_VERSION = Build.VERSION.SDK_INT;
+
+  @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.P)
+  public static boolean supportsDistortionCorrection() {


I find these types of classes aid in readability a ton. That said it is even better when there are breadcrumbs to the source of truth but are annoying to find during a refactor and this is already a net improvement. To that end I have added suggestions with links to the android docs for at many as I could find.

...era/camera_android/android/src/main/java/io/flutter/plugins/camera/SdkCapabilityChecker.java

Co-authored-by: Reid Baker <hamilton.reid.baker@gmail.com>

flutter/packages@369ee7e...6889cca 2023-07-17 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 2.20.3 to 2.20.4 (flutter/packages#4490) 2023-07-15 stuartmorgan@google.com [ci] Switch Android unit tests to LUCI (flutter/packages#4406) 2023-07-15 stuartmorgan@google.com [ci] Introduce LUCI versions of Linux desktop platform tests (flutter/packages#4223) 2023-07-14 43054281+camsim99@users.noreply.github.com [camerax] Marks all wrapped classes as immutable (flutter/packages#4451) 2023-07-14 47866232+chunhtai@users.noreply.github.com [go_router] Bumps example go_router version and migrate example code (flutter/packages#4469) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC flutter-ecosystem@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

stuartmorgan added 6 commits July 7, 2023 08:14

Fix shard index

2d98156

Skip flaky test on web

4a553a6

Undo migration of Android unit tests

548e6da

Revert "Undo migration of Android unit tests"

ff42883

This reverts commit 548e6da.

Switch to JDK 12 for Android

b4a8952

stuartmorgan requested a review from tarrinneal as a code owner July 7, 2023 18:34

github-actions bot added the p: video_player label Jul 7, 2023

stuartmorgan mentioned this pull request Jul 7, 2023

JVM crash running flutter/packages Android unit tests flutter/flutter#130148

Closed

stuartmorgan added 10 commits July 11, 2023 15:33

Merge branch 'main' into luci-enable-linux-unit-jdk-12

36ca493

Enable LUCI test

9995ab1

Fix file_selector; don't use reflection in test

78d7a5b

Update camera to use abstract capability checker

ce4d5d4

Replace the remaining static access

49e28f5

Fix quick_actions tests

205621b

webview WIP

a0786b9

Fix webview tests

a6fe405

Rework previous versions to have more code within the tested path

650281f

Missed formatting

b4f513a

stuartmorgan requested review from camsim99, gmackall and bparrishMines as code owners July 13, 2023 00:26

github-actions bot added p: camera p: file_selector p: quick_actions p: webview_flutter platform-android and removed p: video_player labels Jul 13, 2023

Add missing return

c128a32

stuartmorgan added 3 commits July 13, 2023 06:58

Fix the new file_selector test

ae5e9fb

Merge branch 'main' into luci-enable-linux-unit-jdk-12

935cddd

Bump versions

ab00422

stuartmorgan changed the title ~~[ci] WIP: Try JDK 12~~ [ci] Switch Android unit tests to LUCI Jul 13, 2023

stuartmorgan requested a review from reidbaker July 13, 2023 11:04

yusuf-goog approved these changes Jul 13, 2023

View reviewed changes

tarrinneal approved these changes Jul 13, 2023

View reviewed changes

reidbaker approved these changes Jul 14, 2023

View reviewed changes

stuartmorgan and others added 5 commits July 14, 2023 21:48

Add comments

9975a89

Co-authored-by: Reid Baker <hamilton.reid.baker@gmail.com>

Fix indentation, add one more docs reference

529d44e

Merge branch 'main' into luci-enable-linux-unit-jdk-12

a4503ec

Try JDK 17

bf74408

Keep build-all-packages on JDK 11

8a17345

stuartmorgan added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 15, 2023

auto-submit bot merged commit 166e2c2 into flutter:main Jul 15, 2023

engine-flutter-autoroll mentioned this pull request Jul 17, 2023

Roll Packages from 369ee7e1a1cb to 6889cca8ba78 (5 revisions) flutter/flutter#130721

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 17, 2023

166e2c2 [ci] Switch Android unit tests to LUCI (flutter/packages#4406)

7475074

reidbaker mentioned this pull request Jul 26, 2023

[Tooling] Add google owned cache for dependencies as an option in ci #4567

Merged

11 tasks

reidbaker mentioned this pull request Aug 4, 2023

[All] Expand artifact hub to all plugins #4645

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ci] Switch Android unit tests to LUCI #4406

[ci] Switch Android unit tests to LUCI #4406

stuartmorgan commented Jul 7, 2023 •

edited

Loading

stuartmorgan commented Jul 13, 2023 •

edited

Loading

reidbaker Jul 14, 2023

reidbaker Jul 14, 2023

[ci] Switch Android unit tests to LUCI #4406

[ci] Switch Android unit tests to LUCI #4406

Conversation

stuartmorgan commented Jul 7, 2023 • edited Loading

stuartmorgan commented Jul 13, 2023 • edited Loading

reidbaker Jul 14, 2023

Choose a reason for hiding this comment

reidbaker Jul 14, 2023

Choose a reason for hiding this comment

stuartmorgan commented Jul 7, 2023 •

edited

Loading

stuartmorgan commented Jul 13, 2023 •

edited

Loading