Skip to content

Commit f2ff19c

Browse files
[ci] Switch some tests to LUCI (flutter#4395)
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#114373
1 parent 8918e93 commit f2ff19c

File tree

4 files changed

+15
-71
lines changed

4 files changed

+15
-71
lines changed

.ci.yaml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ targets:
9797
version_file: flutter_master.version
9898

9999
- name: Linux repo_checks
100-
bringup: true # New target
101100
recipe: packages/packages
102101
timeout: 30
103102
properties:
@@ -282,7 +281,6 @@ targets:
282281
channel: stable
283282

284283
- name: Linux_android android_platform_tests_shard_1 master
285-
bringup: true # New target
286284
recipe: packages/packages
287285
timeout: 60
288286
properties:
@@ -293,7 +291,6 @@ targets:
293291
package_sharding: "--shardIndex 0 --shardCount 6"
294292

295293
- name: Linux_android android_platform_tests_shard_2 master
296-
bringup: true # New target
297294
recipe: packages/packages
298295
timeout: 60
299296
properties:
@@ -304,7 +301,6 @@ targets:
304301
package_sharding: "--shardIndex 1 --shardCount 6"
305302

306303
- name: Linux_android android_platform_tests_shard_3 master
307-
bringup: true # New target
308304
recipe: packages/packages
309305
timeout: 60
310306
properties:
@@ -315,7 +311,6 @@ targets:
315311
package_sharding: "--shardIndex 2 --shardCount 6"
316312

317313
- name: Linux_android android_platform_tests_shard_4 master
318-
bringup: true # New target
319314
recipe: packages/packages
320315
timeout: 60
321316
properties:
@@ -326,7 +321,6 @@ targets:
326321
package_sharding: "--shardIndex 3 --shardCount 6"
327322

328323
- name: Linux_android android_platform_tests_shard_5 master
329-
bringup: true # New target
330324
recipe: packages/packages
331325
timeout: 60
332326
properties:
@@ -337,18 +331,16 @@ targets:
337331
package_sharding: "--shardIndex 4 --shardCount 6"
338332

339333
- name: Linux_android android_platform_tests_shard_6 master
340-
bringup: true # New target
341334
recipe: packages/packages
342335
timeout: 60
343336
properties:
344337
target_file: android_platform_tests.yaml
345338
channel: master
346339
version_file: flutter_master.version
347340
cores: "32"
348-
package_sharding: "--shardIndex 6 --shardCount 6"
341+
package_sharding: "--shardIndex 5 --shardCount 6"
349342

350343
- name: Linux_android android_platform_tests_shard_1 stable
351-
bringup: true # New target
352344
recipe: packages/packages
353345
presubmit: false
354346
timeout: 60
@@ -360,7 +352,6 @@ targets:
360352
package_sharding: "--shardIndex 0 --shardCount 6"
361353

362354
- name: Linux_android android_platform_tests_shard_2 stable
363-
bringup: true # New target
364355
recipe: packages/packages
365356
presubmit: false
366357
timeout: 60
@@ -372,7 +363,6 @@ targets:
372363
package_sharding: "--shardIndex 1 --shardCount 6"
373364

374365
- name: Linux_android android_platform_tests_shard_3 stable
375-
bringup: true # New target
376366
recipe: packages/packages
377367
presubmit: false
378368
timeout: 60
@@ -384,7 +374,6 @@ targets:
384374
package_sharding: "--shardIndex 2 --shardCount 6"
385375

386376
- name: Linux_android android_platform_tests_shard_4 stable
387-
bringup: true # New target
388377
recipe: packages/packages
389378
presubmit: false
390379
timeout: 60
@@ -396,7 +385,6 @@ targets:
396385
package_sharding: "--shardIndex 3 --shardCount 6"
397386

398387
- name: Linux_android android_platform_tests_shard_5 stable
399-
bringup: true # New target
400388
recipe: packages/packages
401389
presubmit: false
402390
timeout: 60
@@ -408,7 +396,6 @@ targets:
408396
package_sharding: "--shardIndex 4 --shardCount 6"
409397

410398
- name: Linux_android android_platform_tests_shard_6 stable
411-
bringup: true # New target
412399
recipe: packages/packages
413400
presubmit: false
414401
timeout: 60
@@ -417,7 +404,7 @@ targets:
417404
channel: stable
418405
version_file: flutter_stable.version
419406
cores: "32"
420-
package_sharding: "--shardIndex 6 --shardCount 6"
407+
package_sharding: "--shardIndex 5 --shardCount 6"
421408

422409
### Web tasks ###
423410
- name: Linux_web web_build_all_packages master
@@ -438,7 +425,6 @@ targets:
438425
channel: stable
439426

440427
- name: Linux_web web_platform_tests_shard_1 master
441-
bringup: true # New target
442428
recipe: packages/packages
443429
timeout: 60
444430
properties:
@@ -449,7 +435,6 @@ targets:
449435
package_sharding: "--shardIndex 0 --shardCount 2"
450436

451437
- name: Linux_web web_platform_tests_shard_2 master
452-
bringup: true # New target
453438
recipe: packages/packages
454439
timeout: 60
455440
properties:
@@ -460,7 +445,6 @@ targets:
460445
package_sharding: "--shardIndex 1 --shardCount 2"
461446

462447
- name: Linux_web web_platform_tests_shard_1 stable
463-
bringup: true # New target
464448
recipe: packages/packages
465449
timeout: 60
466450
properties:
@@ -471,7 +455,6 @@ targets:
471455
package_sharding: "--shardIndex 0 --shardCount 2"
472456

473457
- name: Linux_web web_platform_tests_shard_2 stable
474-
bringup: true # New target
475458
recipe: packages/packages
476459
timeout: 60
477460
properties:

.ci/targets/android_platform_tests.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ tasks:
1111
# different exclusions.
1212
# TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
1313
# these steps.
14-
- name: native unit tests
15-
script: script/tool_runner.sh
16-
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
14+
# TODO(stuartmorgan): Enable this once https://github.com/flutter/flutter/issues/130148
15+
# is resolved.
16+
#- name: native unit tests
17+
# script: script/tool_runner.sh
18+
# args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
1719
# TODO(stuartmorgan): Enable these once
1820
# https://github.com/flutter/flutter/issues/120736 is implemented.
1921
# See also https://github.com/flutter/flutter/issues/114373

.cirrus.yml

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ task:
6565
# (on Flutter master).
6666
- name: repo_checks
6767
always:
68-
format_script: ./script/tool_runner.sh format --fail-on-change
69-
license_script: $PLUGIN_TOOL_COMMAND license-check
70-
# The major and minor version here should match the lowest version
71-
# analyzed in legacy_version_analyze.
72-
pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.3.0 --allow-dependencies=script/configs/allowed_unpinned_deps.yaml --allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml
73-
readme_script:
74-
- ./script/tool_runner.sh readme-check
75-
# Re-run with --require-excerpts, skipping packages that still need
76-
# to be converted. Once https://github.com/flutter/flutter/issues/102679
77-
# has been fixed, this can be removed and there can just be a single
78-
# run with --require-excerpts and no exclusions.
79-
- ./script/tool_runner.sh readme-check --require-excerpts --exclude=script/configs/temp_exclude_excerpt.yaml
80-
dependabot_script: $PLUGIN_TOOL_COMMAND dependabot-check
81-
gradle_script: $PLUGIN_TOOL_COMMAND gradle-check
8268
version_script:
8369
# For pre-submit, pass the PR labels to the script to allow for
8470
# check overrides.
@@ -90,7 +76,6 @@ task:
9076
- else
9177
- ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS"
9278
- fi
93-
publishable_script: ./script/tool_runner.sh publish-check --allow-pre-release
9479
federated_safety_script:
9580
# This check is only meaningful for PRs, as it validates changes
9681
# rather than state.
@@ -173,27 +158,20 @@ task:
173158
skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
174159
env:
175160
matrix:
176-
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 8"
177-
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 8"
178-
PACKAGE_SHARDING: "--shardIndex 2 --shardCount 8"
179-
PACKAGE_SHARDING: "--shardIndex 3 --shardCount 8"
180-
PACKAGE_SHARDING: "--shardIndex 4 --shardCount 8"
181-
PACKAGE_SHARDING: "--shardIndex 5 --shardCount 8"
182-
PACKAGE_SHARDING: "--shardIndex 6 --shardCount 8"
183-
PACKAGE_SHARDING: "--shardIndex 7 --shardCount 8"
161+
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 6"
162+
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 6"
163+
PACKAGE_SHARDING: "--shardIndex 2 --shardCount 6"
164+
PACKAGE_SHARDING: "--shardIndex 3 --shardCount 6"
165+
PACKAGE_SHARDING: "--shardIndex 4 --shardCount 6"
166+
PACKAGE_SHARDING: "--shardIndex 5 --shardCount 6"
184167
matrix:
185168
CHANNEL: "master"
186169
CHANNEL: "stable"
187170
MAPS_API_KEY: ENCRYPTED[d6583b08f79f91ea4844c77460f04539965e46ad2fd97fb7c062b4dfe88016228b86ebe8c220ab4187e0c4bd773dc1e7]
188171
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[1a2eebf9367197bbe812d9a0ea83a53a05aeba4bb5e4964fe6a69727883cd87e51238d39237b1f80b0894c48419ac268]
189-
build_script:
190-
- ./script/tool_runner.sh build-examples --apk
191-
lint_script:
192-
- ./script/tool_runner.sh lint-android # must come after build-examples
193172
native_unit_test_script:
194173
# Native integration tests are handled by Firebase Test Lab below, so
195174
# only run unit tests.
196-
# Must come after build-examples.
197175
- ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml
198176
firebase_test_lab_script:
199177
- if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
@@ -202,28 +180,7 @@ task:
202180
- else
203181
- echo "This user does not have permission to run Firebase Test Lab tests."
204182
- fi
205-
# Upload the full lint results to Cirrus to display in the results UI.
206-
always:
207-
android-lint_artifacts:
208-
path: "**/reports/lint-results-debug.xml"
209-
type: text/xml
210-
format: android-lint
211183
### Web tasks ###
212-
- name: web-platform_tests
213-
env:
214-
matrix:
215-
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 2"
216-
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 2"
217-
matrix:
218-
CHANNEL: "master"
219-
CHANNEL: "stable"
220-
<< : *INSTALL_CHROME_LINUX
221-
chromedriver_background_script:
222-
- $CHROMEDRIVER_EXECUTABLE --port=4444
223-
build_script:
224-
- ./script/tool_runner.sh build-examples --web
225-
drive_script:
226-
- ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
227184
- name: web_benchmarks_test
228185
env:
229186
matrix:

packages/video_player/video_player/example/integration_test/video_player_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ void main() {
142142
expect(controller.value.isPlaying, false);
143143
expect(controller.value.position, tenMillisBeforeEnd);
144144
},
145+
// Flaky on web: https://github.com/flutter/flutter/issues/130147
146+
skip: kIsWeb,
145147
);
146148

147149
testWidgets(

0 commit comments

Comments
 (0)