From ddcdd9eda6843edd4a23c18967db043e3c3dc492 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 7 Dec 2023 14:57:16 -0800 Subject: [PATCH 1/8] Add new target + configuration --- .ci.yaml | 12 +++ ci/builders/linux_android_emulator_33.json | 110 +++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 ci/builders/linux_android_emulator_33.json diff --git a/.ci.yaml b/.ci.yaml index 2bb6169d74886..88657e7fa0edb 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -64,6 +64,18 @@ targets: - lib/ui/** - shell/platform/android/** + - name: Linux linux_android_emulator_tests_api_33 + enabled_branches: + - main + recipe: engine_v2/engine_v2 + properties: + config_name: linux_android_emulator_api_33 + timeout: 60 + runIf: + - .ci.yaml + - lib/ui/** + - shell/platform/android/** + - name: Linux builder_cache enabled_branches: - main diff --git a/ci/builders/linux_android_emulator_33.json b/ci/builders/linux_android_emulator_33.json new file mode 100644 index 0000000000000..1cd977d022937 --- /dev/null +++ b/ci/builders/linux_android_emulator_33.json @@ -0,0 +1,110 @@ +{ + "builds": [ + { + "drone_dimensions": [ + "device_type=none", + "os=Linux", + "kvm=1", + "cores=8" + ], + "gn": [ + "--android", + "--android-cpu=x64", + "--no-lto", + "--rbe", + "--no-goma" + ], + "name": "android_debug_x64", + "ninja": { + "config": "android_debug_x64", + "targets": [ + "flutter/shell/platform/android:flutter_shell_native_unittests", + "flutter/testing/scenario_app" + ] + }, + "tests": [ + { + "language": "python3", + "name": "Android Unit Tests", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "33" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/run_tests.py", + "parameters": [ + "--android-variant", + "android_debug_x64", + "--type", + "android" + ] + }, + { + "language": "bash", + "name": "Scenario App Integration Tests", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "33" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/scenario_app/run_android_tests.sh", + "parameters": [ + "android_debug_x64" + ] + } + ] + }, + { + "drone_dimensions": [ + "device_type=none", + "os=Linux", + "kvm=1", + "cores=8" + ], + "gn": [ + "--android", + "--android-cpu=x86", + "--no-lto", + "--rbe", + "--no-goma" + ], + "name": "android_debug_x86", + "ninja": { + "config": "android_debug_x86", + "targets": [ + "flutter/shell/platform/android:flutter_shell_native_unittests" + ] + }, + "tests": [ + { + "language": "python3", + "name": "Android Unit Tests (API 28)", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "28" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/run_tests.py", + "parameters": [ + "--android-variant", + "android_debug_x86", + "--type", + "android" + ] + } + ] + } + ] +} \ No newline at end of file From 600a3dd789cfd1cddbb6c444773d7155f35795bd Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 7 Dec 2023 15:00:59 -0800 Subject: [PATCH 2/8] Mark new task as bringup: true --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index 88657e7fa0edb..ebe92401a23c2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -65,6 +65,7 @@ targets: - shell/platform/android/** - name: Linux linux_android_emulator_tests_api_33 + bringup: true enabled_branches: - main recipe: engine_v2/engine_v2 From ea09d9ecb40a35bb72b39dbe392e446668e5fcd1 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 7 Dec 2023 15:33:33 -0800 Subject: [PATCH 3/8] Run in presubmit for testing --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index ebe92401a23c2..b3c505bc5e7e1 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -66,6 +66,7 @@ targets: - name: Linux linux_android_emulator_tests_api_33 bringup: true + presubmit: true # TESTING CHANGE ONLY enabled_branches: - main recipe: engine_v2/engine_v2 From e9238c107295aaac99bc3ae928dbbbc3a9e6e907 Mon Sep 17 00:00:00 2001 From: Camille Simon <43054281+camsim99@users.noreply.github.com> Date: Fri, 8 Dec 2023 08:20:18 -0800 Subject: [PATCH 4/8] Update linux_android_emulator_33.json --- ci/builders/linux_android_emulator_33.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/linux_android_emulator_33.json b/ci/builders/linux_android_emulator_33.json index 1cd977d022937..a62a6e28dbf00 100644 --- a/ci/builders/linux_android_emulator_33.json +++ b/ci/builders/linux_android_emulator_33.json @@ -107,4 +107,4 @@ ] } ] -} \ No newline at end of file +} From e59c2c93accdad6cea2ecb16fa3fedf8e6f9e267 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Fri, 8 Dec 2023 13:53:18 -0800 Subject: [PATCH 5/8] Remove testing change --- .ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index b3c505bc5e7e1..ebe92401a23c2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -66,7 +66,6 @@ targets: - name: Linux linux_android_emulator_tests_api_33 bringup: true - presubmit: true # TESTING CHANGE ONLY enabled_branches: - main recipe: engine_v2/engine_v2 From c13be0a33261ed5d9ad42c99e85a329ebd6c4e6d Mon Sep 17 00:00:00 2001 From: Camille Simon <43054281+camsim99@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:55:45 -0800 Subject: [PATCH 6/8] Update .ci.yaml Adds comment for context. --- .ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 2f588d72256ba..ee677ea7aa676 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -64,6 +64,8 @@ targets: - lib/ui/** - shell/platform/android/** +# Task to run Linux linux_android_emulator_tests on AVDs running Android 33 +# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947. - name: Linux linux_android_emulator_tests_api_33 bringup: true enabled_branches: From 5f0126b767a2cb19742b704ac46414035a17c013 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 12 Dec 2023 10:34:36 -0800 Subject: [PATCH 7/8] Rename --- ...ndroid_emulator_33.json => linux_android_emulator_api_33.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ci/builders/{linux_android_emulator_33.json => linux_android_emulator_api_33.json} (100%) diff --git a/ci/builders/linux_android_emulator_33.json b/ci/builders/linux_android_emulator_api_33.json similarity index 100% rename from ci/builders/linux_android_emulator_33.json rename to ci/builders/linux_android_emulator_api_33.json From d12dc9f9a981360e8f1eb4721a81a62ba191adfc Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 12 Dec 2023 13:36:34 -0800 Subject: [PATCH 8/8] Delete unused test --- .../linux_android_emulator_api_33.json | 46 +------------------ 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/ci/builders/linux_android_emulator_api_33.json b/ci/builders/linux_android_emulator_api_33.json index a62a6e28dbf00..4a93d79d08393 100644 --- a/ci/builders/linux_android_emulator_api_33.json +++ b/ci/builders/linux_android_emulator_api_33.json @@ -61,50 +61,6 @@ ] } ] - }, - { - "drone_dimensions": [ - "device_type=none", - "os=Linux", - "kvm=1", - "cores=8" - ], - "gn": [ - "--android", - "--android-cpu=x86", - "--no-lto", - "--rbe", - "--no-goma" - ], - "name": "android_debug_x86", - "ninja": { - "config": "android_debug_x86", - "targets": [ - "flutter/shell/platform/android:flutter_shell_native_unittests" - ] - }, - "tests": [ - { - "language": "python3", - "name": "Android Unit Tests (API 28)", - "test_dependencies": [ - { - "dependency": "android_virtual_device", - "version": "28" - } - ], - "contexts": [ - "android_virtual_device" - ], - "script": "flutter/testing/run_tests.py", - "parameters": [ - "--android-variant", - "android_debug_x86", - "--type", - "android" - ] - } - ] } ] -} +} \ No newline at end of file