From c14bd5b3375a439111b66b5abaf762214d27c48e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 12:15:13 -0700 Subject: [PATCH 1/9] Remove some orchestrator builds that only kick off other builds --- .ci.yaml | 2 +- ci/builders/{ => standalone}/linux_unopt_debug_no_rbe.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/builders/{ => standalone}/linux_unopt_debug_no_rbe.json (100%) diff --git a/.ci.yaml b/.ci.yaml index bc79a74b34e57..022bccd8bdfe6 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -382,7 +382,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 diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_unopt_debug_no_rbe.json similarity index 100% rename from ci/builders/linux_unopt_debug_no_rbe.json rename to ci/builders/standalone/linux_unopt_debug_no_rbe.json From 595cdc2ce336b3677da29c8c8837bd2da38b3781 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 12:17:13 -0700 Subject: [PATCH 2/9] Remove 'builds' key --- .../standalone/linux_unopt_debug_no_rbe.json | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/ci/builders/standalone/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_unopt_debug_no_rbe.json index 19f205009b793..9838ba99d7b28 100644 --- a/ci/builders/standalone/linux_unopt_debug_no_rbe.json +++ b/ci/builders/standalone/linux_unopt_debug_no_rbe.json @@ -7,36 +7,32 @@ "targets are specified, the build will fail, and if an empty list of ", "targets are specified, all targets are built (wasteful/slow)" ], - "builds": [ + "drone_dimensions": ["device_type=none", "os=Linux", "cores=32"], + "gn": [ + "--runtime-mode", + "debug", + "--unoptimized", + "--prebuilt-dart-sdk", + "--no-lto", + "--no-rbe", + "--no-goma", + "--target-dir", + "ci/linux_unopt_debug_no_rbe" + ], + "name": "ci/linux_unopt_debug_no_rbe", + "description": "Tests clangd on Linux.", + "ninja": { + "config": "ci/linux_unopt_debug_no_rbe", + "targets": ["flutter/tools/font_subset"] + }, + "tests": [ { - "drone_dimensions": ["device_type=none", "os=Linux", "cores=32"], - "gn": [ - "--runtime-mode", - "debug", - "--unoptimized", - "--prebuilt-dart-sdk", - "--no-lto", - "--no-rbe", - "--no-goma", - "--target-dir", - "ci/linux_unopt_debug_no_rbe" - ], - "name": "ci/linux_unopt_debug_no_rbe", - "description": "Tests clangd on Linux.", - "ninja": { - "config": "ci/linux_unopt_debug_no_rbe", - "targets": ["flutter/tools/font_subset"] - }, - "tests": [ - { - "language": "dart", - "name": "clangd", - "script": "flutter/tools/clangd_check/bin/main.dart", - "parameters": [ - "--clangd=buildtools/linux-x64/clang/bin/clangd", - "--compile-commands-dir=../out/ci/linux_unopt_debug_no_rbe" - ] - } + "language": "dart", + "name": "clangd", + "script": "flutter/tools/clangd_check/bin/main.dart", + "parameters": [ + "--clangd=buildtools/linux-x64/clang/bin/clangd", + "--compile-commands-dir=../out/ci/linux_unopt_debug_no_rbe" ] } ] From 9670b35380ac08555dd6067c7f28993c65f3cca2 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 12:51:31 -0700 Subject: [PATCH 3/9] Move drone requirements to .ci.yaml --- .ci.yaml | 1 + ci/builders/standalone/linux_unopt_debug_no_rbe.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 022bccd8bdfe6..690a110d06c41 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -384,6 +384,7 @@ targets: - name: Linux clangd recipe: engine_v2/builder properties: + cores: "32" config_name: linux_unopt_debug_no_rbe - name: Linux linux_unopt diff --git a/ci/builders/standalone/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_unopt_debug_no_rbe.json index 9838ba99d7b28..05a775a1cab20 100644 --- a/ci/builders/standalone/linux_unopt_debug_no_rbe.json +++ b/ci/builders/standalone/linux_unopt_debug_no_rbe.json @@ -7,7 +7,6 @@ "targets are specified, the build will fail, and if an empty list of ", "targets are specified, all targets are built (wasteful/slow)" ], - "drone_dimensions": ["device_type=none", "os=Linux", "cores=32"], "gn": [ "--runtime-mode", "debug", From 87022f0bfc0b2af0642153c25b19d0f8176181f8 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 13:37:03 -0700 Subject: [PATCH 4/9] linux_android_emulator_skia_tests_34 --- .ci.yaml | 1 + .../linux_android_emulator_skia_34.json | 91 ------------------- .../linux_android_emulator_skia_34.json | 81 +++++++++++++++++ 3 files changed, 82 insertions(+), 91 deletions(-) delete mode 100644 ci/builders/linux_android_emulator_skia_34.json create mode 100644 ci/builders/standalone/linux_android_emulator_skia_34.json diff --git a/.ci.yaml b/.ci.yaml index 690a110d06c41..e07842cc01a91 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -121,6 +121,7 @@ targets: recipe: engine_v2/engine_v2 properties: config_name: linux_android_emulator_skia_34 + kvm: "1" dependencies: >- [ {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} diff --git a/ci/builders/linux_android_emulator_skia_34.json b/ci/builders/linux_android_emulator_skia_34.json deleted file mode 100644 index 2f14d32c85699..0000000000000 --- a/ci/builders/linux_android_emulator_skia_34.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "builds": [ - { - "drone_dimensions": [ - "device_type=none", - "os=Linux", - "kvm=1", - "cores=8" - ], - "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_34_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" - ] - }, - { - "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_34_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" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/ci/builders/standalone/linux_android_emulator_skia_34.json b/ci/builders/standalone/linux_android_emulator_skia_34.json new file mode 100644 index 0000000000000..b8217ff272856 --- /dev/null +++ b/ci/builders/standalone/linux_android_emulator_skia_34.json @@ -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_34_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" + ] + }, + { + "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_34_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" + ] + } + ] +} \ No newline at end of file From 7584f337621d60859bae32ad0ea80b7c201b06a6 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 13:42:53 -0700 Subject: [PATCH 5/9] linux_android_emulator_skia --- .ci.yaml | 5 +- ci/builders/linux_android_emulator_skia.json | 91 ------------------- .../linux_android_emulator_skia.json | 81 +++++++++++++++++ 3 files changed, 84 insertions(+), 93 deletions(-) delete mode 100644 ci/builders/linux_android_emulator_skia.json create mode 100644 ci/builders/standalone/linux_android_emulator_skia.json diff --git a/.ci.yaml b/.ci.yaml index e07842cc01a91..43a89625ec054 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -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" dependencies: >- [ {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} @@ -118,7 +119,7 @@ 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" diff --git a/ci/builders/linux_android_emulator_skia.json b/ci/builders/linux_android_emulator_skia.json deleted file mode 100644 index a3d3a63eb63b4..0000000000000 --- a/ci/builders/linux_android_emulator_skia.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "builds": [ - { - "drone_dimensions": [ - "device_type=none", - "os=Linux", - "kvm=1", - "cores=8" - ], - "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" - }, - { - "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" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/ci/builders/standalone/linux_android_emulator_skia.json b/ci/builders/standalone/linux_android_emulator_skia.json new file mode 100644 index 0000000000000..70b8b8bb359b3 --- /dev/null +++ b/ci/builders/standalone/linux_android_emulator_skia.json @@ -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" + }, + { + "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" + ] + } + ] +} \ No newline at end of file From 4a914fce1857032d203239d73e63617bf98f1624 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 14:15:11 -0700 Subject: [PATCH 6/9] Temporarily remove linux_android_emulator_skia_tests bringup to test in presubmit --- .ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 43a89625ec054..dc14fac14499a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -95,7 +95,6 @@ targets: - testing/skia_gold_client/** - name: Linux linux_android_emulator_skia_tests - bringup: true enabled_branches: - main recipe: engine_v2/builder From d3e3b1f1d401a45c48c2dd8d97ae1c0c20c922b3 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 14:19:36 -0700 Subject: [PATCH 7/9] Newlines --- ci/builders/standalone/linux_android_emulator_skia.json | 2 +- ci/builders/standalone/linux_android_emulator_skia_34.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/builders/standalone/linux_android_emulator_skia.json b/ci/builders/standalone/linux_android_emulator_skia.json index 70b8b8bb359b3..afc6dbf6b4c3d 100644 --- a/ci/builders/standalone/linux_android_emulator_skia.json +++ b/ci/builders/standalone/linux_android_emulator_skia.json @@ -78,4 +78,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/ci/builders/standalone/linux_android_emulator_skia_34.json b/ci/builders/standalone/linux_android_emulator_skia_34.json index b8217ff272856..cbaf9a95b7732 100644 --- a/ci/builders/standalone/linux_android_emulator_skia_34.json +++ b/ci/builders/standalone/linux_android_emulator_skia_34.json @@ -78,4 +78,4 @@ ] } ] -} \ No newline at end of file +} From e9a20ff6ed8086959fabe9276b389037b3f4cb65 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 15:34:05 -0700 Subject: [PATCH 8/9] Revert bringup removal --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index dc14fac14499a..43a89625ec054 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -95,6 +95,7 @@ targets: - testing/skia_gold_client/** - name: Linux linux_android_emulator_skia_tests + bringup: true enabled_branches: - main recipe: engine_v2/builder From ff2baddb5124f4609314e67c513492a3aba70e08 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 13 Sep 2024 19:41:09 -0700 Subject: [PATCH 9/9] 32->8 cores --- .ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 43a89625ec054..1f970459af914 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -386,7 +386,6 @@ targets: - name: Linux clangd recipe: engine_v2/builder properties: - cores: "32" config_name: linux_unopt_debug_no_rbe - name: Linux linux_unopt