From 6f3f1c8a244d157dffe34f0d533322c72fbb120a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 12 Feb 2024 20:43:52 -0800 Subject: [PATCH 1/6] Run Skia and Impeller OpenGLES on APIv28. --- ci/builders/linux_android_emulator.json | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index ab6da20cb0bf9..0d58485379cb4 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -78,6 +78,28 @@ "--no-enable-impeller" ] }, + { + "language": "bash", + "name": "Android Scenario App Integration Tests (Skia, API v28)", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "android_28_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "build_id:8759428741582061553" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/scenario_app/run_android_tests.sh", + "parameters": [ + "android_debug_x64", + "--no-enable-impeller" + ] + }, { "language": "bash", "name": "Android Scenario App Integration Tests (Impeller/Vulkan)", @@ -123,6 +145,29 @@ "--enable-impeller", "--impeller-backend=opengles" ] + }, + { + "language": "bash", + "name": "Android Scenario App Integration Tests (Impeller/OpenGLES, API v28)", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "android_28_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "build_id:8759428741582061553" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/scenario_app/run_android_tests.sh", + "parameters": [ + "android_debug_x64", + "--enable-impeller", + "--impeller-backend=opengles" + ] } ] }, From 464bc33526dd74a697de90a7871453ee1de4eea3 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 12 Feb 2024 21:17:53 -0800 Subject: [PATCH 2/6] ++ --- .ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 5d9d99027b172..7581b5498f49a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -61,6 +61,7 @@ targets: timeout: 60 runIf: - .ci.yaml + - ci/builders/linux_android_emulator.json - DEPS - lib/ui/** - shell/platform/android/** @@ -82,6 +83,7 @@ targets: timeout: 60 runIf: - .ci.yaml + - ci/builders/linux_android_emulator_api_33.json - DEPS - lib/ui/** - shell/platform/android/** From 5aa00832a6bc8d9d779aa1543a0f31067132b976 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 13 Feb 2024 09:00:01 -0800 Subject: [PATCH 3/6] ++ --- ci/builders/linux_android_emulator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index 0d58485379cb4..9fb0f263146af 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -84,7 +84,7 @@ "test_dependencies": [ { "dependency": "android_virtual_device", - "version": "android_28_google_apis_x64.textpb" + "version": "android_28_google_apis_x86.textpb" }, { "dependency": "avd_cipd_version", @@ -152,7 +152,7 @@ "test_dependencies": [ { "dependency": "android_virtual_device", - "version": "android_28_google_apis_x64.textpb" + "version": "android_28_google_apis_x86.textpb" }, { "dependency": "avd_cipd_version", From d9e365cc8cce144dc7cfee559b7c653d3642c355 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 13 Feb 2024 10:49:22 -0800 Subject: [PATCH 4/6] ++ --- ci/builders/linux_android_emulator.json | 91 +++++++++++++------------ 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index 9fb0f263146af..0d19010dc061e 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -78,28 +78,6 @@ "--no-enable-impeller" ] }, - { - "language": "bash", - "name": "Android Scenario App Integration Tests (Skia, API v28)", - "test_dependencies": [ - { - "dependency": "android_virtual_device", - "version": "android_28_google_apis_x86.textpb" - }, - { - "dependency": "avd_cipd_version", - "version": "build_id:8759428741582061553" - } - ], - "contexts": [ - "android_virtual_device" - ], - "script": "flutter/testing/scenario_app/run_android_tests.sh", - "parameters": [ - "android_debug_x64", - "--no-enable-impeller" - ] - }, { "language": "bash", "name": "Android Scenario App Integration Tests (Impeller/Vulkan)", @@ -145,29 +123,6 @@ "--enable-impeller", "--impeller-backend=opengles" ] - }, - { - "language": "bash", - "name": "Android Scenario App Integration Tests (Impeller/OpenGLES, API v28)", - "test_dependencies": [ - { - "dependency": "android_virtual_device", - "version": "android_28_google_apis_x86.textpb" - }, - { - "dependency": "avd_cipd_version", - "version": "build_id:8759428741582061553" - } - ], - "contexts": [ - "android_virtual_device" - ], - "script": "flutter/testing/scenario_app/run_android_tests.sh", - "parameters": [ - "android_debug_x64", - "--enable-impeller", - "--impeller-backend=opengles" - ] } ] }, @@ -219,6 +174,52 @@ "--type", "android" ] + }, + + { + "language": "bash", + "name": "Android Scenario App Integration Tests (Skia, API v28)", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "android_28_google_apis_x86.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "build_id:8759428741582061553" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/scenario_app/run_android_tests.sh", + "parameters": [ + "android_debug_x86", + "--no-enable-impeller" + ] + }, + { + "language": "bash", + "name": "Android Scenario App Integration Tests (Impeller/OpenGLES, API v28)", + "test_dependencies": [ + { + "dependency": "android_virtual_device", + "version": "android_28_google_apis_x86.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "build_id:8759428741582061553" + } + ], + "contexts": [ + "android_virtual_device" + ], + "script": "flutter/testing/scenario_app/run_android_tests.sh", + "parameters": [ + "android_debug_x86", + "--enable-impeller", + "--impeller-backend=opengles" + ] } ] } From 1b3f36a065eb2fe7216ef388f035e1d2759720d0 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 13 Feb 2024 12:56:42 -0800 Subject: [PATCH 5/6] Build scenario_app for x86. --- ci/builders/linux_android_emulator.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index 0d19010dc061e..ef5109ea6ea3f 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -147,7 +147,8 @@ "ninja": { "config": "android_debug_x86", "targets": [ - "flutter/shell/platform/android:flutter_shell_native_unittests" + "flutter/shell/platform/android:flutter_shell_native_unittests", + "flutter/testing/scenario_app" ] }, "tests": [ From dd38e03e470d184918f4def33eed2538dbafdc32 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 13 Feb 2024 14:08:28 -0800 Subject: [PATCH 6/6] Add goldctl. --- ci/builders/linux_android_emulator.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index ef5109ea6ea3f..e522f4e1e6c7f 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -143,6 +143,12 @@ "--rbe", "--no-goma" ], + "dependencies": [ + { + "dependency": "goldctl", + "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd" + } + ], "name": "android_debug_x86", "ninja": { "config": "android_debug_x86",