Upgrade integration tests to use AGP 7.3/Gradle 7.4 #129642

gmackall · 2023-06-27T16:51:40Z

Upgrades tests under dev/integration_tests to use the latest values in the templates. Most of this PR was auto-generated, by running find dev/integration_tests/ -type d -name 'android' | dart dev/tools/bin/generate_gradle_lockfiles.dart from the root of the flutter directory.

The pieces that were not are:

Upgrading the Gradle versions used in integration tests to be >=7.4, in places where it was currently lower.
Upgrading the mac, windows, and linux build_tests .ci.yaml configuration to use jdk 17 on all shards. It currently was using a mix of 17 and 11. This isn't desirable, because some of the tests require 17, and the distribution is random across shards (so they were only passing because they were getting randomly placed on shards using jdk 17).
Adding a dependency on jdk 11 for the tests based on the firebaselab/firebaselab recipe. Previously they had no java dependency, and were therefore defaulting to java 1.8. The newer AGP versions necessitated an upgrade to 11 to run.

Note that it also ended up downgrading the AGP version in two places (in the hybrid_android_views and platform_interaction tests), because those had been manually edited to a newer version than the template.

Related to: #123636, #123910

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

gmackall · 2023-06-27T17:33:34Z

This may also unblock #122779 (see this comment), though the changes are worth landing independently.

camsim99

LGTM! Can you note in the description where AGP was downgraded? I assume it's not a problem but may be good to remember.

gmackall · 2023-06-28T16:16:29Z

LGTM! Can you note in the description where AGP was downgraded? I assume it's not a problem but may be good to remember.

Updated the description to link to the two places

gmackall · 2023-06-28T16:43:00Z

As a follow up it might be good to make the shards these tests use for a specific platform (e.g. Mac build_tests_1_4,...,Mac build_tests_4_4) share a common configuration, or at least have a comment noting changes should be made to all shards.

Otherwise the test behavior is implicitly relying on the current distribution of tests across the shards, which makes it easy to introduce issues like this where failures only manifest on later, unrelated PRs.

johnmccutchan · 2023-06-28T17:34:15Z

dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle

Is it possible and should we try and use named constants for these version numbers (here and elsewhere)?

We could definitely make the templates use the values of some constants when generating the new build.gradle that we use to overwrite the existing (and link it to the versions we use to generate the build.gradle in new projects, if we wanted).

I'm actually not sure how lockfile generation would work if we made the values in the generated build.gradles be constants, though. My guess is that it would generate lockfiles based on the value of the constant, which would mean that whenever we updated the constant we would still need to re-run lockfile generation, essentially "replacing" the value anyways (with itself again). I can try it out though

From testing it looks like constants in the build.gradle get resolved to their values in the lockfiles, so if we did use a constant in the generated build.gradle, it would still resolve to a specific value in the lockfile that wouldn't change in line with updates to the constant. So we would still need to re-run the script, which replaces the value in the generated build.gradle anyways.

I do think it could make sense to have the values in the generate_gradle_lockfiles.dart templates be constants, especially if we did want them to be the same as the values in templates we use to make a new project. I'll file an issue where we can make the decision (#129747).

gmackall · 2023-06-28T23:33:51Z

It looks like previous versions of similar PRs have had a tendency to break in postsubmit (see d155bc1, 1e69683, 7165339).

cc'ing @christopherfujino as I see you've reviewed some of these past PRs - I tried running the devicelab tests that looked relevant to the tests I changed as outlined here, and I didn't run into any issues. Is there anything else you would recommend trying before merging? There still isn't a good way to run postsubmits before submitting, is there?

christopherfujino · 2023-06-29T17:21:05Z

It looks like previous versions of similar PRs have had a tendency to break in postsubmit (see d155bc1, 1e69683, 7165339).

cc'ing @christopherfujino as I see you've reviewed some of these past PRs - I tried running the devicelab tests that looked relevant to the tests I changed as outlined here, and I didn't run into any issues. Is there anything else you would recommend trying before merging? There still isn't a good way to run postsubmits before submitting, is there?

You can test devicelab targets by temporarily changing presubmit: false to true in https://github.com/flutter/flutter/blob/master/.ci.yaml#L1593. Just remember to revert the changes before submitting :)

gmackall · 2023-06-29T19:42:05Z

It looks like previous versions of similar PRs have had a tendency to break in postsubmit (see d155bc1, 1e69683, 7165339).
cc'ing @christopherfujino as I see you've reviewed some of these past PRs - I tried running the devicelab tests that looked relevant to the tests I changed as outlined here, and I didn't run into any issues. Is there anything else you would recommend trying before merging? There still isn't a good way to run postsubmits before submitting, is there?

You can test devicelab targets by temporarily changing presubmit: false to true in https://github.com/flutter/flutter/blob/master/.ci.yaml#L1593. Just remember to revert the changes before submitting :)

Awesome, thanks I'll try that!

gmackall · 2023-06-30T16:55:05Z

There were some failures in enabling the post-submits, but I checked the logs for each one and they all seemed infra-related (they never started for some reason).

Most passed though, and nothing indicated a problem with this change, so I'm going to go ahead and add autosubmit.

auto-submit · 2023-06-30T16:58:23Z

auto label is removed for flutter/flutter, pr: 129642, due to - The status or check suite Mac customer_testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

christopherfujino · 2023-06-30T17:10:02Z

auto label is removed for flutter/flutter, pr: 129642, due to - The status or check suite Mac customer_testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

I'm working on fixing this upstream. You will have to rebase (not merge) upstream once the tree is fixed to fix the tests on your branch.

…files

…esting

…st for testing" This reverts commit 72bdd7a8917783c1d5a6c42950cd2c85f63d6988.

gmackall · 2023-06-30T20:58:42Z

It looks like this caused two runs of the Mac build_tests_2_4 to fail for earlier PRs, because they ended up starting after (first, second) the changes landed, and I assume are pulling the latest .ci.yaml when the test gets started? That must be what is happening, because the dependencies section shows them using jdk 17, which is a change from this PR. Surprising, I would expect the .ci.yaml changes to only start taking effect in the builds for the current commit, not earlier.

Either way it shouldn't cause problems for future commits, though it may affect some presubmits until people merge or rebase.

christopherfujino · 2023-06-30T22:18:52Z

It looks like this caused two runs of the Mac build_tests_2_4 to fail for earlier PRs, because they ended up starting after (first, second) the changes landed, and I assume are pulling the latest .ci.yaml when the test gets started? That must be what is happening, because the dependencies section shows them using jdk 17, which is a change from this PR. Surprising, I would expect the .ci.yaml changes to only start taking effect in the builds for the current commit, not earlier.

Either way it shouldn't cause problems for future commits, though it may affect some presubmits until people merge or rebase.

It's actually that these configurations are generated by a post-submit job, so there's always some lag between when the PR lands and when they take effect: https://ci.chromium.org/ui/p/flutter/builders/prod/Linux%20ci_yaml%20flutter%20roller/9809/overview

christopherfujino · 2023-06-30T22:19:17Z

Oh, and it looks like these ran out of order https://ci.chromium.org/ui/p/flutter/builders/luci.flutter.prod/Linux%20ci_yaml%20flutter%20roller

This is already being tracked in #127063

…flutter#129642)

flutter/flutter@ff838bc...aa5f4a2 2023-07-01 [email protected] Enable no_wildcard_variable_uses lint (flutter/flutter#129858) 2023-06-30 [email protected] mark packages-autoroller bringup again (flutter/flutter#129859) 2023-06-30 [email protected] Update `SwitchTheme` tests for M2/M3 (flutter/flutter#129811) 2023-06-30 [email protected] Change pub roller bot to push to flutter-pub-roller-bot/flutter.git (flutter/flutter#129844) 2023-06-30 [email protected] Fix NetworkImage causing spurious warning in tests (flutter/flutter#129537) 2023-06-30 [email protected] Roll Flutter Engine from 54b573e9c4e5 to e6b8292705a8 (4 revisions) (flutter/flutter#129852) 2023-06-30 [email protected] Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/flutter#129642) 2023-06-30 [email protected] Roll Packages from d4752c4 to 53ed5a0 (5 revisions) (flutter/flutter#129837) 2023-06-30 [email protected] Updated correct tasks for test ownership fix (flutter/flutter#129812) 2023-06-30 [email protected] Updated some golden image tests for M2/M3 (flutter/flutter#129794) 2023-06-30 [email protected] Remove an unnecessary assert (flutter/flutter#129796) 2023-06-30 [email protected] Update `Radio` tests for M2/M3 (flutter/flutter#129814) 2023-06-30 [email protected] Update `Switch` tests for M2/M3 (flutter/flutter#129810) 2023-06-30 [email protected] Roll Flutter Engine from 099a70ebbc60 to 54b573e9c4e5 (1 revision) (flutter/flutter#129821) 2023-06-30 [email protected] Update `SwitchListTile` tests for M2/M3 (flutter/flutter#129809) 2023-06-30 [email protected] Fix `NavigationDrawer` selected item has wrong icon color (flutter/flutter#129625) 2023-06-30 [email protected] Update basic_test.dart for M3 compliance (flutter/flutter#129714) 2023-06-30 [email protected] Roll Flutter Engine from d33343430f18 to 099a70ebbc60 (7 revisions) (flutter/flutter#129818) 2023-06-30 [email protected] Roll Flutter Engine from 68cc1a7971d5 to d33343430f18 (2 revisions) (flutter/flutter#129801) 2023-06-30 [email protected] Revert no-response to fork. (flutter/flutter#129775) 2023-06-30 [email protected] Make `DropdownMenu` be able to scroll to the highlighted item when searching. (flutter/flutter#129740) 2023-06-29 [email protected] Roll Flutter Engine from cd9ce66db14a to 68cc1a7971d5 (10 revisions) (flutter/flutter#129799) 2023-06-29 49699333+dependabot[bot]@users.noreply.github.com Bump actions/labeler from 4.1.0 to 4.2.0 (flutter/flutter#129797) 2023-06-29 [email protected] Roll Flutter Engine from eabb22900b44 to cd9ce66db14a (1 revision) (flutter/flutter#129756) 2023-06-29 [email protected] Remove `@NonNull` to avoid warning (flutter/flutter#129472) 2023-06-29 [email protected] Remove use of any (flutter/flutter#129793) 2023-06-29 [email protected] Prepare for utf8.encode() to return more precise Uint8List type (flutter/flutter#129769) 2023-06-29 [email protected] Deletes files that should be ignored (flutter/flutter#127984) 2023-06-29 [email protected] Fix flutter_plugins by rolling revision (flutter/flutter#129781) 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 Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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

…flutter#129642)

github-actions bot added the c: contributor-productivity Team-specific productivity, code health, technical debt. label Jun 27, 2023

gmackall added the platform-android Android applications specifically label Jun 27, 2023

gmackall requested review from camsim99, johnmccutchan and reidbaker June 27, 2023 19:41

gmackall marked this pull request as ready for review June 27, 2023 19:42

camsim99 approved these changes Jun 28, 2023

View reviewed changes

johnmccutchan approved these changes Jun 28, 2023

View reviewed changes

github-actions bot added c: contributor-productivity Team-specific productivity, code health, technical debt. and removed c: contributor-productivity Team-specific productivity, code health, technical debt. labels Jun 29, 2023

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 30, 2023

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 30, 2023

Gray Mackall added 5 commits June 30, 2023 11:45

upgrade all windows, mac, and linux build_tests shards to use jdk 17

0a22c68

upgrade integration tests to AGP 7.3/Gradle 7.4, and re-generate lock…

5099e17

…files

add java 11 dependency to firebase tests

e34e0ec

enable postsubmits to run in presubmit, DO NOT MERGE THIS, just for t…

e7cab6f

…esting

Revert "enable postsubmits to run in presubmit, DO NOT MERGE THIS, ju…

e78f6fb

…st for testing" This reverts commit 72bdd7a8917783c1d5a6c42950cd2c85f63d6988.

gmackall force-pushed the integration_AGP_upgrade branch from aecb663 to e78f6fb Compare June 30, 2023 18:45

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 30, 2023

auto-submit bot merged commit d1eb1f0 into flutter:master Jun 30, 2023

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

Roll Flutter from ff838bca8990 to aa5f4a28e9a8 (29 revisions) flutter/packages#4363

Merged

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

d1eb1f0 Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/…

5aad835

…flutter#129642)

gmackall mentioned this pull request Jul 5, 2023

Define anchors for build_tests dependencies #130037

Closed

8 tasks

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023

d1eb1f0 Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/…

e13f70e

…flutter#129642)

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

d1eb1f0 Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/…

71e65a7

…flutter#129642)

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

d1eb1f0 Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/…

502e5fe

…flutter#129642)

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

d1eb1f0 Upgrade integration tests to use AGP 7.3/Gradle 7.4 (flutter/…

5490c75

…flutter#129642)

Upgrade integration tests to use AGP 7.3/Gradle 7.4 #129642

Upgrade integration tests to use AGP 7.3/Gradle 7.4 #129642

Uh oh!

Conversation

gmackall commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

gmackall commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camsim99 left a comment

Choose a reason for hiding this comment

Uh oh!

gmackall commented Jun 28, 2023

Uh oh!

gmackall commented Jun 28, 2023

Uh oh!

johnmccutchan Jun 28, 2023

Choose a reason for hiding this comment

Uh oh!

gmackall Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmackall Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

johnmccutchan Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

gmackall commented Jun 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

christopherfujino commented Jun 29, 2023

Uh oh!

gmackall commented Jun 29, 2023

Uh oh!

gmackall commented Jun 30, 2023

Uh oh!

auto-submit bot commented Jun 30, 2023

Uh oh!

christopherfujino commented Jun 30, 2023

Uh oh!

gmackall commented Jun 30, 2023

Uh oh!

christopherfujino commented Jun 30, 2023

Uh oh!

christopherfujino commented Jun 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

gmackall commented Jun 27, 2023 •

edited

Loading

gmackall commented Jun 27, 2023 •

edited

Loading

gmackall Jun 28, 2023 •

edited

Loading

gmackall Jun 28, 2023 •

edited

Loading

gmackall commented Jun 28, 2023 •

edited

Loading

christopherfujino commented Jun 30, 2023 •

edited

Loading