Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 9bb0ece

Browse files
authored
Remove Linux orchestrator builds that only kick off one other build and wait (#55186)
"Orchestrator" builders are top-level builds that can perform some caching, kick off "drone" sub-builds, and then do things with those build artifacts like run tests, or "generators" that do work on those artifacts. See more details in https://flutter.dev/go/engine-build-definition-language. Some orchestrators in [`ci/builders`](https://github.com/flutter/engine/tree/38e37ce9879b2efe4890a8d09f4207dc5686a1bd/ci/builders) _only_ kick off one sub-build. This is suboptimal because: 1. The orchestrator uses a bot that does nothing except essentially idle. 2. The orchestrator has some overhead, so the orchestrator + single drone sub-build takes longer than just the sub-build run alone. 3. The "drone" sub-build often has a generic name like "Linux Engine Drone" which makes it difficult to keep track of which build is which. This PR: 1. Hoists a few of these Linux builds into [`ci/builders/standalone`](https://github.com/flutter/engine/tree/38e37ce9879b2efe4890a8d09f4207dc5686a1bd/ci/builders/standalone) which are run as individual builds, and removes the orchestrator. 2. Swaps the recipe from `engine_v2/engine_v2` (orchestrator) to `engine_v2/builder` (standalone). 3. Moves the `drone_dimensions` from the orchestrator build json into .ci.yaml. | Builder | Before | After | | -------- | ------- | ------- | | `Linux clangd` | [9m & 2 Linux bots](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20clangd/6272/overview) ([drone build](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20Engine%20Drone/2689993/overview)) | [6m & 1 Linux bot](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20clangd/6292/overview) | | `Linux linux_android_emulator_skia_tests_34` | [29m & 2 Linux bots](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20linux_android_emulator_skia_tests_34/663/overview) ([drone build](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20Engine%20Drone/2690008/overview)) | [25m & 1 Linux bot](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20linux_android_emulator_skia_tests_34/678/overview) | Part of flutter/flutter#155041 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent e8723f4 commit 9bb0ece

7 files changed

+205
-228
lines changed

.ci.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ targets:
9898
bringup: true
9999
enabled_branches:
100100
- main
101-
recipe: engine_v2/engine_v2
101+
recipe: engine_v2/builder
102102
properties:
103103
config_name: linux_android_emulator_skia
104+
kvm: "1"
104105
dependencies: >-
105106
[
106107
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -118,9 +119,10 @@ targets:
118119
- name: Linux linux_android_emulator_skia_tests_34
119120
enabled_branches:
120121
- main
121-
recipe: engine_v2/engine_v2
122+
recipe: engine_v2/builder
122123
properties:
123124
config_name: linux_android_emulator_skia_34
125+
kvm: "1"
124126
dependencies: >-
125127
[
126128
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -382,7 +384,7 @@ targets:
382384
- flutter_frontend_server/**
383385

384386
- name: Linux clangd
385-
recipe: engine_v2/engine_v2
387+
recipe: engine_v2/builder
386388
properties:
387389
config_name: linux_unopt_debug_no_rbe
388390

ci/builders/linux_android_emulator_skia.json

Lines changed: 0 additions & 91 deletions
This file was deleted.

ci/builders/linux_android_emulator_skia_34.json

Lines changed: 0 additions & 91 deletions
This file was deleted.

ci/builders/linux_unopt_debug_no_rbe.json

Lines changed: 0 additions & 43 deletions
This file was deleted.
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"gclient_variables": {
3+
"use_rbe": true
4+
},
5+
"gn": [
6+
"--android",
7+
"--android-cpu=x64",
8+
"--no-lto",
9+
"--rbe",
10+
"--no-goma",
11+
"--target-dir",
12+
"ci/android_emulator_skia_debug_x64"
13+
],
14+
"dependencies": [
15+
{
16+
"dependency": "goldctl",
17+
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
18+
}
19+
],
20+
"name": "ci/android_emulator_skia_debug_x64",
21+
"description": "Build for debug mode x64 Android Skia scenario app tests.",
22+
"ninja": {
23+
"config": "ci/android_emulator_skia_debug_x64",
24+
"targets": [
25+
"flutter/impeller/toolkit/android:unittests",
26+
"flutter/shell/platform/android:flutter_shell_native_unittests",
27+
"flutter/testing/scenario_app"
28+
]
29+
},
30+
"tests": [
31+
{
32+
"language": "dart",
33+
"name": "Android Scenario App Integration Tests (Skia)",
34+
"test_timeout_secs": 900,
35+
"max_attempts": 2,
36+
"test_dependencies": [
37+
{
38+
"dependency": "android_virtual_device",
39+
"version": "android_35_google_apis_x64.textpb"
40+
},
41+
{
42+
"dependency": "avd_cipd_version",
43+
"version": "build_id:8740267484269553649"
44+
}
45+
],
46+
"contexts": [
47+
"android_virtual_device"
48+
],
49+
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
50+
"parameters": [
51+
"--out-dir=../out/ci/android_emulator_skia_debug_x64",
52+
"--no-enable-impeller"
53+
]
54+
},
55+
{
56+
"language": "dart",
57+
"name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
58+
"test_timeout_secs": 900,
59+
"max_attempts": 2,
60+
"test_dependencies": [
61+
{
62+
"dependency": "android_virtual_device",
63+
"version": "android_35_google_apis_x64.textpb"
64+
},
65+
{
66+
"dependency": "avd_cipd_version",
67+
"version": "build_id:8740267484269553649"
68+
}
69+
],
70+
"contexts": [
71+
"android_virtual_device"
72+
],
73+
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
74+
"parameters": [
75+
"--out-dir=../out/ci/android_emulator_skia_debug_x64",
76+
"--no-enable-impeller",
77+
"--force-surface-producer-surface-texture"
78+
]
79+
}
80+
]
81+
}

0 commit comments

Comments
 (0)