From 8127546e0b230945ca2d8803dae0e5a5c04c18bb Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Sun, 16 Jul 2023 10:20:47 -0400 Subject: [PATCH 1/3] [ci] Try 8 cores for comparison --- .ci.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 8702a476974..3c904042c5d 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -118,7 +118,6 @@ targets: target_file: dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux dart_unit_test_shard_2 master @@ -129,7 +128,6 @@ targets: target_file: dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux dart_unit_test_shard_1 stable @@ -139,7 +137,6 @@ targets: target_file: dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux dart_unit_test_shard_2 stable @@ -149,7 +146,6 @@ targets: target_file: dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_1 master @@ -160,7 +156,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_2 master @@ -171,7 +166,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_1 stable @@ -181,7 +175,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 2" - name: Linux_web web_dart_unit_test_shard_2 stable @@ -191,7 +184,6 @@ targets: target_file: web_dart_unit_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 2" - name: Linux analyze master @@ -251,7 +243,6 @@ targets: add_recipes_cq: "true" version_file: flutter_master.version target_file: linux_custom_package_tests.yaml - cores: "32" # Pigeon tests need Andoid deps (thus the Linux_android base) and # clang-format. # web_benchmarks needs Chrome. @@ -268,7 +259,6 @@ targets: properties: version_file: flutter_stable.version target_file: linux_custom_package_tests.yaml - cores: "32" # See comments on 'master' version above. dependencies: >- [ @@ -313,7 +303,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 6" - name: Linux_android android_platform_tests_shard_2 master @@ -323,7 +312,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 6" - name: Linux_android android_platform_tests_shard_3 master @@ -333,7 +321,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 2 --shardCount 6" - name: Linux_android android_platform_tests_shard_4 master @@ -343,7 +330,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 3 --shardCount 6" - name: Linux_android android_platform_tests_shard_5 master @@ -353,7 +339,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 4 --shardCount 6" - name: Linux_android android_platform_tests_shard_6 master @@ -363,7 +348,6 @@ targets: target_file: android_platform_tests.yaml channel: master version_file: flutter_master.version - cores: "32" package_sharding: "--shardIndex 5 --shardCount 6" - name: Linux_android android_platform_tests_shard_1 stable @@ -374,7 +358,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 0 --shardCount 6" - name: Linux_android android_platform_tests_shard_2 stable @@ -385,7 +368,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 1 --shardCount 6" - name: Linux_android android_platform_tests_shard_3 stable @@ -396,7 +378,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 2 --shardCount 6" - name: Linux_android android_platform_tests_shard_4 stable @@ -407,7 +388,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 3 --shardCount 6" - name: Linux_android android_platform_tests_shard_5 stable @@ -418,7 +398,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 4 --shardCount 6" - name: Linux_android android_platform_tests_shard_6 stable @@ -429,7 +408,6 @@ targets: target_file: android_platform_tests.yaml channel: stable version_file: flutter_stable.version - cores: "32" package_sharding: "--shardIndex 5 --shardCount 6" ### Web tasks ### @@ -455,7 +433,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_master.version channel: master package_sharding: "--shardIndex 0 --shardCount 2" @@ -465,7 +442,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_master.version channel: master package_sharding: "--shardIndex 1 --shardCount 2" @@ -475,7 +451,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_stable.version channel: stable package_sharding: "--shardIndex 0 --shardCount 2" @@ -485,7 +460,6 @@ targets: timeout: 60 properties: target_file: web_platform_tests.yaml - cores: "32" version_file: flutter_stable.version channel: stable package_sharding: "--shardIndex 1 --shardCount 2" From 9919a602f9eabf1c0e3828cf80d74e4decd2d603 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Sun, 16 Jul 2023 18:56:49 -0400 Subject: [PATCH 2/3] Trigger a second run for more timing info --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 3c904042c5d..24cb7634769 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2,7 +2,7 @@ # # Flutter infra uses this file to generate a checklist of tasks to be performed # for every commit. -# +# # More information at: # * https://github.com/flutter/cocoon/blob/main/CI_YAML.md enabled_branches: From a2760e00283436093c15bc29580bcdb1ca538b67 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 17 Jul 2023 11:26:59 -0400 Subject: [PATCH 3/3] Add more shards --- .ci.yaml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 24cb7634769..5615c81dd08 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2,7 +2,7 @@ # # Flutter infra uses this file to generate a checklist of tasks to be performed # for every commit. -# +# # More information at: # * https://github.com/flutter/cocoon/blob/main/CI_YAML.md enabled_branches: @@ -446,6 +446,18 @@ targets: channel: master package_sharding: "--shardIndex 1 --shardCount 2" + - name: Linux_web web_platform_tests_shard_3 master + # TODO(stuartmorgan): Adjust the shard count for the other targets + # when removing this. + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + target_file: web_platform_tests.yaml + version_file: flutter_master.version + channel: master + package_sharding: "--shardIndex 2 --shardCount 3" + - name: Linux_web web_platform_tests_shard_1 stable recipe: packages/packages timeout: 60 @@ -464,6 +476,18 @@ targets: channel: stable package_sharding: "--shardIndex 1 --shardCount 2" + - name: Linux_web web_platform_tests_shard_3 stable + # TODO(stuartmorgan): Adjust the shard count for the other targets + # when removing this. + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + target_file: web_platform_tests.yaml + version_file: flutter_stable.version + channel: stable + package_sharding: "--shardIndex 2 --shardCount 3" + ### Linux desktop tasks - name: Linux_desktop build_all_packages master recipe: packages/packages @@ -734,6 +758,7 @@ targets: {"dependency": "open_jdk", "version": "version:11"} ] + # TODO(stuartmorgan): Remove these two when enabling the sharded versions. - name: Windows win32-platform_tests master - packages recipe: packages/packages timeout: 60 @@ -760,6 +785,66 @@ targets: {"dependency": "vs_build", "version": "version:vs2019"} ] + - name: Windows win32-platform_tests_shard_1 master + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: master + version_file: flutter_master.version + package_sharding: "--shardIndex 0 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_2 master + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: master + version_file: flutter_master.version + package_sharding: "--shardIndex 1 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_1 stable + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: stable + version_file: flutter_stable.version + package_sharding: "--shardIndex 0 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + + - name: Windows win32-platform_tests_shard_2 stable + bringup: true # New target + recipe: packages/packages + timeout: 60 + properties: + add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + channel: stable + version_file: flutter_stable.version + package_sharding: "--shardIndex 1 --shardCount 2" + dependencies: > + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + - name: Windows windows-build_all_packages master recipe: packages/packages timeout: 30