From 2105f68176d82c36007e2706b46eff18f96c70f6 Mon Sep 17 00:00:00 2001 From: sealesj <103135467+sealesj@users.noreply.github.com> Date: Mon, 5 Dec 2022 10:51:40 -0500 Subject: [PATCH 1/6] Migrate Packaging Builders to .ci.yaml (#115569) * packaging builder initial config * add release scheduler parameter * remove stables * add taskname + test owner * testowner test * comment structure * test naming convention * test adding tags * add timeout * prune names * Update testowners. * Move packaging to shards section. * Set packaging as shard. * Use packaging V2 Co-authored-by: godofredoc --- .ci.yaml | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++ TESTOWNERS | 1 + 2 files changed, 118 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index b1e6c87b659ca..355ee6e525ae8 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4331,3 +4331,120 @@ targets: ["devicelab", "android", "windows"] task_name: windows_chrome_dev_mode scheduler: luci + + - name: Windows windows_startup_test + recipe: devicelab/devicelab_drone + presubmit: false + timeout: 60 + properties: + dependencies: >- + [ + {"dependency": "vs_build", "version": "version:vs2019"} + ] + tags: > + ["devicelab", "hostonly", "windows"] + task_name: windows_startup_test + + - name: Windows flutter_tool_startup__windows + recipe: devicelab/devicelab_drone + presubmit: false + timeout: 60 + properties: + tags: > + ["devicelab", "hostonly", "windows"] + task_name: flutter_tool_startup__windows + + - name: Linux flutter_tool_startup__linux + recipe: devicelab/devicelab_drone + presubmit: false + timeout: 60 + properties: + tags: > + ["devicelab", "hostonly", "linux"] + task_name: flutter_tool_startup__linux + + - name: Mac flutter_tool_startup__macos + recipe: devicelab/devicelab_drone + presubmit: false + timeout: 60 + properties: + tags: > + ["devicelab", "hostonly", "mac"] + task_name: flutter_tool_startup__macos + + - name: Linux flutter_packaging_beta + recipe: packaging_v2/packaging_v2 + timeout: 60 + scheduler: release + bringup: true + enabled_branches: + - beta + properties: + task_name: flutter_packaging_beta + tags: > + ["framework", "hostonly", "shard", "linux"] + + + - name: Mac flutter_packaging_beta + recipe: packaging_v2/packaging_v2 + timeout: 60 + scheduler: release + bringup: true + enabled_branches: + - beta + properties: + task_name: flutter_packaging_beta + tags: > + ["framework", "hostonly", "shard", "mac"] + + + - name: Mac_arm64 flutter_packaging_beta + recipe: packaging_v2/packaging_v2 + timeout: 60 + scheduler: release + bringup: true + enabled_branches: + - beta + properties: + task_name: flutter_packaging_beta + tags: > + ["framework", "hostonly", "shard", "mac"] + + + - name: Windows flutter_packaging_beta + recipe: packaging_v2/packaging_v2 + timeout: 60 + scheduler: release + bringup: true + enabled_branches: + - beta + properties: + task_name: flutter_packaging_beta + tags: > + ["framework", "hostonly", "shard", "windows"] + + + # TODO(drewroengoogle): Remove this target when the release scheduler is + # confirmed to be working correctly and as intended. + # (https://github.com/flutter/flutter/issues/100806) + # This target is marked `bringup: true` because this is a temporary target + # that is not intended to impact the tree. + - name: Linux docs_deploy_with_release_scheduler + recipe: flutter/flutter + scheduler: release + bringup: true + presubmit: false + timeout: 60 + properties: + cores: "32" + dependencies: >- + [ + {"dependency": "dashing", "version": "0.4.0"}, + {"dependency": "firebase", "version": "v11.0.1"} + ] + tags: > + ["framework", "hostonly", "linux"] + validation: docs + validation_name: Docs + firebase_project: master-docs-flutter-dev + release_ref: refs/heads/master diff --git a/TESTOWNERS b/TESTOWNERS index 37a22825ab1f7..9cf38b830703f 100644 --- a/TESTOWNERS +++ b/TESTOWNERS @@ -262,3 +262,4 @@ # skp_generator @Hixie # test_ownership @keyonghan # verify_binaries_codesigned @christopherfujino @flutter/releases +# flutter_packaging_beta @godofredoc @flutter/infra From 6ea9f954515eda1b7bc4bebb155be0f1f4adb605 Mon Sep 17 00:00:00 2001 From: sealesj <103135467+sealesj@users.noreply.github.com> Date: Mon, 5 Dec 2022 17:21:07 -0500 Subject: [PATCH 2/6] use deploy suffix (#116533) --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 355ee6e525ae8..e8d741cf9f1a2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4444,7 +4444,7 @@ targets: ] tags: > ["framework", "hostonly", "linux"] - validation: docs - validation_name: Docs + validation: docs_deploy + validation_name: Docs_deploy firebase_project: master-docs-flutter-dev release_ref: refs/heads/master From e8adf1457c3197ab2c90f053c5351051b11e7791 Mon Sep 17 00:00:00 2001 From: godofredoc Date: Wed, 7 Dec 2022 07:57:02 -0800 Subject: [PATCH 3/6] Update docs_deploy builder with the real name. (#116631) This is removing the temporary comments and simplifying the name. Bug: https://github.com/flutter/flutter/issues/115489 --- .ci.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index e8d741cf9f1a2..2bd5a7b6b4756 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4424,12 +4424,7 @@ targets: ["framework", "hostonly", "shard", "windows"] - # TODO(drewroengoogle): Remove this target when the release scheduler is - # confirmed to be working correctly and as intended. - # (https://github.com/flutter/flutter/issues/100806) - # This target is marked `bringup: true` because this is a temporary target - # that is not intended to impact the tree. - - name: Linux docs_deploy_with_release_scheduler + - name: Linux docs_deploy recipe: flutter/flutter scheduler: release bringup: true @@ -4446,5 +4441,5 @@ targets: ["framework", "hostonly", "linux"] validation: docs_deploy validation_name: Docs_deploy + # TODO(godofredoc): Update to docs-flutter-dev before release. firebase_project: master-docs-flutter-dev - release_ref: refs/heads/master From 9816d5dfbe03c63b1f1073a1c5e66414ecfd08cc Mon Sep 17 00:00:00 2001 From: sealesj <103135467+sealesj@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:19:05 -0500 Subject: [PATCH 4/6] Add Remaining Packaging Builders (#116683) * add stable packaging builders * update testowners * consolidate and use enabled_branches * update to reflect the consolidation --- .ci.yaml | 21 ++++++++++++--------- TESTOWNERS | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 2bd5a7b6b4756..3623278d545ee 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4372,54 +4372,57 @@ targets: ["devicelab", "hostonly", "mac"] task_name: flutter_tool_startup__macos - - name: Linux flutter_packaging_beta + - name: Linux flutter_packaging recipe: packaging_v2/packaging_v2 timeout: 60 scheduler: release bringup: true enabled_branches: - beta + - stable properties: - task_name: flutter_packaging_beta + task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "linux"] - - - name: Mac flutter_packaging_beta + - name: Mac flutter_packaging recipe: packaging_v2/packaging_v2 timeout: 60 scheduler: release bringup: true enabled_branches: - beta + - stable properties: - task_name: flutter_packaging_beta + task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "mac"] - - name: Mac_arm64 flutter_packaging_beta + - name: Mac_arm64 flutter_packaging recipe: packaging_v2/packaging_v2 timeout: 60 scheduler: release bringup: true enabled_branches: - beta + - stable properties: - task_name: flutter_packaging_beta + task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "mac"] - - name: Windows flutter_packaging_beta + - name: Windows flutter_packaging recipe: packaging_v2/packaging_v2 timeout: 60 scheduler: release bringup: true enabled_branches: - beta + - stable properties: - task_name: flutter_packaging_beta + task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "windows"] diff --git a/TESTOWNERS b/TESTOWNERS index 9cf38b830703f..66cf9cdf5132d 100644 --- a/TESTOWNERS +++ b/TESTOWNERS @@ -262,4 +262,4 @@ # skp_generator @Hixie # test_ownership @keyonghan # verify_binaries_codesigned @christopherfujino @flutter/releases -# flutter_packaging_beta @godofredoc @flutter/infra +# flutter_packaging @godofredoc @flutter/infra From ab3fd9ea63049a5b33478cda7d69f47eb9b55c7f Mon Sep 17 00:00:00 2001 From: godofredoc Date: Fri, 9 Dec 2022 13:12:24 -0800 Subject: [PATCH 5/6] Several fixes to packaging builders. (#116800) It includes the following changes: * Adds main as the enabled branches. * Adds docs_beta and docs_stable to pass the expected gcp project. * Adds dimensions to packaging arm64 to ensure that it runs on arm64 bot. Bug: https://github.com/orgs/flutter/projects/43 --- .ci.yaml | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 3623278d545ee..8a787238c8162 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4380,6 +4380,7 @@ targets: enabled_branches: - beta - stable + - main properties: task_name: flutter_packaging tags: > @@ -4393,6 +4394,7 @@ targets: enabled_branches: - beta - stable + - main properties: task_name: flutter_packaging tags: > @@ -4407,10 +4409,13 @@ targets: enabled_branches: - beta - stable + - main properties: task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "mac"] + drone_dimensions: > + ["cpu=arm64"] - name: Windows flutter_packaging @@ -4421,16 +4426,20 @@ targets: enabled_branches: - beta - stable + - main properties: task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "windows"] - - name: Linux docs_deploy + - name: Linux docs_deploy_beta recipe: flutter/flutter scheduler: release bringup: true + enabled_branches: + - beta + - main presubmit: false timeout: 60 properties: @@ -4444,5 +4453,25 @@ targets: ["framework", "hostonly", "linux"] validation: docs_deploy validation_name: Docs_deploy - # TODO(godofredoc): Update to docs-flutter-dev before release. firebase_project: master-docs-flutter-dev + + - name: Linux docs_deploy_stable + recipe: flutter/flutter + scheduler: release + bringup: true + enabled_branches: + - stable + presubmit: false + timeout: 60 + properties: + cores: "32" + dependencies: >- + [ + {"dependency": "dashing", "version": "0.4.0"}, + {"dependency": "firebase", "version": "v11.0.1"} + ] + tags: > + ["framework", "hostonly", "linux"] + validation: docs_deploy + validation_name: Docs_deploy + firebase_project: docs-flutter-dev From 93658bbc51aee9f7e1f4bb9d0786c72bffd702a3 Mon Sep 17 00:00:00 2001 From: godofredoc Date: Mon, 12 Dec 2022 07:17:51 -0800 Subject: [PATCH 6/6] Pass drone_dimensions as part of the main target. (#116812) * Pass drone_dimensions as part of the main target. Drone dimensions were passed as properties when the sharding utility is expecting them in the target. Bug: https://github.com/flutter/flutter/issues/116794 * Use dimensions instead of drone_dimensions. * Use a map format. --- .ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 8a787238c8162..1971b70321b4b 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -4414,9 +4414,8 @@ targets: task_name: flutter_packaging tags: > ["framework", "hostonly", "shard", "mac"] - drone_dimensions: > - ["cpu=arm64"] - + dimensions: + cpu: "arm64" - name: Windows flutter_packaging recipe: packaging_v2/packaging_v2