-
Notifications
You must be signed in to change notification settings - Fork 6k
Remove Linux orchestrator builds that only kick off one other build and wait #55186
Changes from all commits
c14bd5b
595cdc2
9670b35
87022f0
7584f33
4a914fc
d3e3b1f
e9a20ff
ff2badd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -98,9 +98,10 @@ targets: | |||
bringup: true | ||||
enabled_branches: | ||||
- main | ||||
recipe: engine_v2/engine_v2 | ||||
recipe: engine_v2/builder | ||||
properties: | ||||
config_name: linux_android_emulator_skia | ||||
kvm: "1" | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Copied from
|
||||
dependencies: >- | ||||
[ | ||||
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} | ||||
|
@@ -118,9 +119,10 @@ targets: | |||
- name: Linux linux_android_emulator_skia_tests_34 | ||||
enabled_branches: | ||||
- main | ||||
recipe: engine_v2/engine_v2 | ||||
recipe: engine_v2/builder | ||||
properties: | ||||
config_name: linux_android_emulator_skia_34 | ||||
kvm: "1" | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Copied from
|
||||
dependencies: >- | ||||
[ | ||||
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} | ||||
|
@@ -382,7 +384,7 @@ targets: | |||
- flutter_frontend_server/** | ||||
|
||||
- name: Linux clangd | ||||
recipe: engine_v2/engine_v2 | ||||
recipe: engine_v2/builder | ||||
properties: | ||||
config_name: linux_unopt_debug_no_rbe | ||||
|
||||
|
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,81 @@ | ||||||
{ | ||||||
"gclient_variables": { | ||||||
"use_rbe": true | ||||||
}, | ||||||
"gn": [ | ||||||
"--android", | ||||||
"--android-cpu=x64", | ||||||
"--no-lto", | ||||||
"--rbe", | ||||||
"--no-goma", | ||||||
"--target-dir", | ||||||
"ci/android_emulator_skia_debug_x64" | ||||||
], | ||||||
"dependencies": [ | ||||||
{ | ||||||
"dependency": "goldctl", | ||||||
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd" | ||||||
} | ||||||
], | ||||||
"name": "ci/android_emulator_skia_debug_x64", | ||||||
"description": "Build for debug mode x64 Android Skia scenario app tests.", | ||||||
"ninja": { | ||||||
"config": "ci/android_emulator_skia_debug_x64", | ||||||
"targets": [ | ||||||
"flutter/impeller/toolkit/android:unittests", | ||||||
"flutter/shell/platform/android:flutter_shell_native_unittests", | ||||||
"flutter/testing/scenario_app" | ||||||
] | ||||||
}, | ||||||
"tests": [ | ||||||
{ | ||||||
"language": "dart", | ||||||
"name": "Android Scenario App Integration Tests (Skia)", | ||||||
"test_timeout_secs": 900, | ||||||
"max_attempts": 2, | ||||||
"test_dependencies": [ | ||||||
{ | ||||||
"dependency": "android_virtual_device", | ||||||
"version": "android_35_google_apis_x64.textpb" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this file encode the "35" nature in some way? "ci/android_emulator_skia_debug_x64" is duplicate, but "ci/android_emulator_skia_debug_x64/API35" is more descriptive It took me having to copy these two files and diff them locally to spot the difference There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I completely blindly copied one file to the other, the only difference is that I removed two levels of nesting: engine/ci/builders/linux_android_emulator_skia_34.json Lines 1 to 2 in 38e37ce
Like this: 595cdc2?diff=split&w=1 Can you file an issue if you'd like it changed? Someone from the Android team should think that through for future bumps https://github.com/flutter/engine/pull/54186/files#diff-ee89d2cc6e90e32301d49469c8a095fc1f92a33526471b2f71f13fea468fa225L77 |
||||||
}, | ||||||
{ | ||||||
"dependency": "avd_cipd_version", | ||||||
"version": "build_id:8740267484269553649" | ||||||
} | ||||||
], | ||||||
"contexts": [ | ||||||
"android_virtual_device" | ||||||
], | ||||||
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart", | ||||||
"parameters": [ | ||||||
"--out-dir=../out/ci/android_emulator_skia_debug_x64", | ||||||
"--no-enable-impeller" | ||||||
] | ||||||
}, | ||||||
{ | ||||||
"language": "dart", | ||||||
"name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)", | ||||||
"test_timeout_secs": 900, | ||||||
"max_attempts": 2, | ||||||
"test_dependencies": [ | ||||||
{ | ||||||
"dependency": "android_virtual_device", | ||||||
"version": "android_35_google_apis_x64.textpb" | ||||||
}, | ||||||
{ | ||||||
"dependency": "avd_cipd_version", | ||||||
"version": "build_id:8740267484269553649" | ||||||
} | ||||||
], | ||||||
"contexts": [ | ||||||
"android_virtual_device" | ||||||
], | ||||||
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart", | ||||||
"parameters": [ | ||||||
"--out-dir=../out/ci/android_emulator_skia_debug_x64", | ||||||
"--no-enable-impeller", | ||||||
"--force-surface-producer-surface-texture" | ||||||
] | ||||||
} | ||||||
] | ||||||
} |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested that this one works by removing
bringup: true
in an intermediate commit.