Skip to content

Commit 9a5b61a

Browse files
[ci] Adjust bot configurations (#4485)
- Converts all 32-core Linux configs to 8-core; comparing all task for two complete runs in each configuration over the weekend, I didn't see any evidence that doing so would meaningfully increase any runtimes, so it appears that we're using high-core configs for no real benefit. - Adds a shard to web platform tests, since it's somewhat overloaded (~35m for shard 1, ~19m for shard 2) - Adds a shard to Windows platform tests, since it's definitely overloaded (~45 minutes)
1 parent 6889cca commit 9a5b61a

File tree

1 file changed

+85
-26
lines changed

1 file changed

+85
-26
lines changed

.ci.yaml

Lines changed: 85 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ targets:
118118
target_file: dart_unit_tests.yaml
119119
channel: master
120120
version_file: flutter_master.version
121-
cores: "32"
122121
package_sharding: "--shardIndex 0 --shardCount 2"
123122

124123
- name: Linux dart_unit_test_shard_2 master
@@ -129,7 +128,6 @@ targets:
129128
target_file: dart_unit_tests.yaml
130129
channel: master
131130
version_file: flutter_master.version
132-
cores: "32"
133131
package_sharding: "--shardIndex 1 --shardCount 2"
134132

135133
- name: Linux dart_unit_test_shard_1 stable
@@ -139,7 +137,6 @@ targets:
139137
target_file: dart_unit_tests.yaml
140138
channel: stable
141139
version_file: flutter_stable.version
142-
cores: "32"
143140
package_sharding: "--shardIndex 0 --shardCount 2"
144141

145142
- name: Linux dart_unit_test_shard_2 stable
@@ -149,7 +146,6 @@ targets:
149146
target_file: dart_unit_tests.yaml
150147
channel: stable
151148
version_file: flutter_stable.version
152-
cores: "32"
153149
package_sharding: "--shardIndex 1 --shardCount 2"
154150

155151
- name: Linux_web web_dart_unit_test_shard_1 master
@@ -160,7 +156,6 @@ targets:
160156
target_file: web_dart_unit_tests.yaml
161157
channel: master
162158
version_file: flutter_master.version
163-
cores: "32"
164159
package_sharding: "--shardIndex 0 --shardCount 2"
165160

166161
- name: Linux_web web_dart_unit_test_shard_2 master
@@ -171,7 +166,6 @@ targets:
171166
target_file: web_dart_unit_tests.yaml
172167
channel: master
173168
version_file: flutter_master.version
174-
cores: "32"
175169
package_sharding: "--shardIndex 1 --shardCount 2"
176170

177171
- name: Linux_web web_dart_unit_test_shard_1 stable
@@ -181,7 +175,6 @@ targets:
181175
target_file: web_dart_unit_tests.yaml
182176
channel: stable
183177
version_file: flutter_stable.version
184-
cores: "32"
185178
package_sharding: "--shardIndex 0 --shardCount 2"
186179

187180
- name: Linux_web web_dart_unit_test_shard_2 stable
@@ -191,7 +184,6 @@ targets:
191184
target_file: web_dart_unit_tests.yaml
192185
channel: stable
193186
version_file: flutter_stable.version
194-
cores: "32"
195187
package_sharding: "--shardIndex 1 --shardCount 2"
196188

197189
- name: Linux analyze master
@@ -251,7 +243,6 @@ targets:
251243
add_recipes_cq: "true"
252244
version_file: flutter_master.version
253245
target_file: linux_custom_package_tests.yaml
254-
cores: "32"
255246
# Pigeon tests need Andoid deps (thus the Linux_android base) and
256247
# clang-format.
257248
# web_benchmarks needs Chrome.
@@ -268,7 +259,6 @@ targets:
268259
properties:
269260
version_file: flutter_stable.version
270261
target_file: linux_custom_package_tests.yaml
271-
cores: "32"
272262
# See comments on 'master' version above.
273263
dependencies: >-
274264
[
@@ -313,7 +303,6 @@ targets:
313303
target_file: android_platform_tests.yaml
314304
channel: master
315305
version_file: flutter_master.version
316-
cores: "32"
317306
package_sharding: "--shardIndex 0 --shardCount 6"
318307

319308
- name: Linux_android android_platform_tests_shard_2 master
@@ -323,7 +312,6 @@ targets:
323312
target_file: android_platform_tests.yaml
324313
channel: master
325314
version_file: flutter_master.version
326-
cores: "32"
327315
package_sharding: "--shardIndex 1 --shardCount 6"
328316

329317
- name: Linux_android android_platform_tests_shard_3 master
@@ -333,7 +321,6 @@ targets:
333321
target_file: android_platform_tests.yaml
334322
channel: master
335323
version_file: flutter_master.version
336-
cores: "32"
337324
package_sharding: "--shardIndex 2 --shardCount 6"
338325

339326
- name: Linux_android android_platform_tests_shard_4 master
@@ -343,7 +330,6 @@ targets:
343330
target_file: android_platform_tests.yaml
344331
channel: master
345332
version_file: flutter_master.version
346-
cores: "32"
347333
package_sharding: "--shardIndex 3 --shardCount 6"
348334

349335
- name: Linux_android android_platform_tests_shard_5 master
@@ -353,7 +339,6 @@ targets:
353339
target_file: android_platform_tests.yaml
354340
channel: master
355341
version_file: flutter_master.version
356-
cores: "32"
357342
package_sharding: "--shardIndex 4 --shardCount 6"
358343

359344
- name: Linux_android android_platform_tests_shard_6 master
@@ -363,7 +348,6 @@ targets:
363348
target_file: android_platform_tests.yaml
364349
channel: master
365350
version_file: flutter_master.version
366-
cores: "32"
367351
package_sharding: "--shardIndex 5 --shardCount 6"
368352

369353
- name: Linux_android android_platform_tests_shard_1 stable
@@ -374,7 +358,6 @@ targets:
374358
target_file: android_platform_tests.yaml
375359
channel: stable
376360
version_file: flutter_stable.version
377-
cores: "32"
378361
package_sharding: "--shardIndex 0 --shardCount 6"
379362

380363
- name: Linux_android android_platform_tests_shard_2 stable
@@ -385,7 +368,6 @@ targets:
385368
target_file: android_platform_tests.yaml
386369
channel: stable
387370
version_file: flutter_stable.version
388-
cores: "32"
389371
package_sharding: "--shardIndex 1 --shardCount 6"
390372

391373
- name: Linux_android android_platform_tests_shard_3 stable
@@ -396,7 +378,6 @@ targets:
396378
target_file: android_platform_tests.yaml
397379
channel: stable
398380
version_file: flutter_stable.version
399-
cores: "32"
400381
package_sharding: "--shardIndex 2 --shardCount 6"
401382

402383
- name: Linux_android android_platform_tests_shard_4 stable
@@ -407,7 +388,6 @@ targets:
407388
target_file: android_platform_tests.yaml
408389
channel: stable
409390
version_file: flutter_stable.version
410-
cores: "32"
411391
package_sharding: "--shardIndex 3 --shardCount 6"
412392

413393
- name: Linux_android android_platform_tests_shard_5 stable
@@ -418,7 +398,6 @@ targets:
418398
target_file: android_platform_tests.yaml
419399
channel: stable
420400
version_file: flutter_stable.version
421-
cores: "32"
422401
package_sharding: "--shardIndex 4 --shardCount 6"
423402

424403
- name: Linux_android android_platform_tests_shard_6 stable
@@ -429,7 +408,6 @@ targets:
429408
target_file: android_platform_tests.yaml
430409
channel: stable
431410
version_file: flutter_stable.version
432-
cores: "32"
433411
package_sharding: "--shardIndex 5 --shardCount 6"
434412

435413
### Web tasks ###
@@ -455,7 +433,6 @@ targets:
455433
timeout: 60
456434
properties:
457435
target_file: web_platform_tests.yaml
458-
cores: "32"
459436
version_file: flutter_master.version
460437
channel: master
461438
package_sharding: "--shardIndex 0 --shardCount 2"
@@ -465,17 +442,27 @@ targets:
465442
timeout: 60
466443
properties:
467444
target_file: web_platform_tests.yaml
468-
cores: "32"
469445
version_file: flutter_master.version
470446
channel: master
471447
package_sharding: "--shardIndex 1 --shardCount 2"
472448

449+
- name: Linux_web web_platform_tests_shard_3 master
450+
# TODO(stuartmorgan): Adjust the shard count for the other targets
451+
# when removing this.
452+
bringup: true # New target
453+
recipe: packages/packages
454+
timeout: 60
455+
properties:
456+
target_file: web_platform_tests.yaml
457+
version_file: flutter_master.version
458+
channel: master
459+
package_sharding: "--shardIndex 2 --shardCount 3"
460+
473461
- name: Linux_web web_platform_tests_shard_1 stable
474462
recipe: packages/packages
475463
timeout: 60
476464
properties:
477465
target_file: web_platform_tests.yaml
478-
cores: "32"
479466
version_file: flutter_stable.version
480467
channel: stable
481468
package_sharding: "--shardIndex 0 --shardCount 2"
@@ -485,11 +472,22 @@ targets:
485472
timeout: 60
486473
properties:
487474
target_file: web_platform_tests.yaml
488-
cores: "32"
489475
version_file: flutter_stable.version
490476
channel: stable
491477
package_sharding: "--shardIndex 1 --shardCount 2"
492478

479+
- name: Linux_web web_platform_tests_shard_3 stable
480+
# TODO(stuartmorgan): Adjust the shard count for the other targets
481+
# when removing this.
482+
bringup: true # New target
483+
recipe: packages/packages
484+
timeout: 60
485+
properties:
486+
target_file: web_platform_tests.yaml
487+
version_file: flutter_stable.version
488+
channel: stable
489+
package_sharding: "--shardIndex 2 --shardCount 3"
490+
493491
### Linux desktop tasks
494492
- name: Linux_desktop build_all_packages master
495493
recipe: packages/packages
@@ -760,6 +758,7 @@ targets:
760758
{"dependency": "open_jdk", "version": "version:11"}
761759
]
762760
761+
# TODO(stuartmorgan): Remove these two when enabling the sharded versions.
763762
- name: Windows win32-platform_tests master - packages
764763
recipe: packages/packages
765764
timeout: 60
@@ -786,6 +785,66 @@ targets:
786785
{"dependency": "vs_build", "version": "version:vs2019"}
787786
]
788787
788+
- name: Windows win32-platform_tests_shard_1 master
789+
bringup: true # New target
790+
recipe: packages/packages
791+
timeout: 60
792+
properties:
793+
add_recipes_cq: "true"
794+
target_file: windows_build_and_platform_tests.yaml
795+
channel: master
796+
version_file: flutter_master.version
797+
package_sharding: "--shardIndex 0 --shardCount 2"
798+
dependencies: >
799+
[
800+
{"dependency": "vs_build", "version": "version:vs2019"}
801+
]
802+
803+
- name: Windows win32-platform_tests_shard_2 master
804+
bringup: true # New target
805+
recipe: packages/packages
806+
timeout: 60
807+
properties:
808+
add_recipes_cq: "true"
809+
target_file: windows_build_and_platform_tests.yaml
810+
channel: master
811+
version_file: flutter_master.version
812+
package_sharding: "--shardIndex 1 --shardCount 2"
813+
dependencies: >
814+
[
815+
{"dependency": "vs_build", "version": "version:vs2019"}
816+
]
817+
818+
- name: Windows win32-platform_tests_shard_1 stable
819+
bringup: true # New target
820+
recipe: packages/packages
821+
timeout: 60
822+
properties:
823+
add_recipes_cq: "true"
824+
target_file: windows_build_and_platform_tests.yaml
825+
channel: stable
826+
version_file: flutter_stable.version
827+
package_sharding: "--shardIndex 0 --shardCount 2"
828+
dependencies: >
829+
[
830+
{"dependency": "vs_build", "version": "version:vs2019"}
831+
]
832+
833+
- name: Windows win32-platform_tests_shard_2 stable
834+
bringup: true # New target
835+
recipe: packages/packages
836+
timeout: 60
837+
properties:
838+
add_recipes_cq: "true"
839+
target_file: windows_build_and_platform_tests.yaml
840+
channel: stable
841+
version_file: flutter_stable.version
842+
package_sharding: "--shardIndex 1 --shardCount 2"
843+
dependencies: >
844+
[
845+
{"dependency": "vs_build", "version": "version:vs2019"}
846+
]
847+
789848
- name: Windows windows-build_all_packages master
790849
recipe: packages/packages
791850
timeout: 30

0 commit comments

Comments
 (0)