diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 20dd187c19775..ecf59f5fb6070 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -14,8 +14,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -53,8 +52,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -93,8 +91,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -133,8 +130,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -172,8 +168,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -212,8 +207,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index cc3a336302a50..87b3f48e0a0cf 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,9 +15,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -49,21 +47,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_debug", - "parameters": [ - "--variant", - "host_debug", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -79,9 +63,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -108,21 +90,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_profile", - "parameters": [ - "--variant", - "host_profile", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -139,9 +107,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "dependencies": [ { @@ -178,20 +144,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Impeller-golden, dart and engine tests for host_release", - "parameters": [ - "--variant", - "host_release", - "--type", - "dart,engine,impeller-golden" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -208,8 +161,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -255,8 +207,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -299,8 +250,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -476,5 +426,99 @@ "destination": "darwin-x64-release/gen_snapshot.zip", "realm": "production" } + ], + "tests": [ + { + "name": "Mac Host Tests for host_debug", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_debug" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_debug", + "parameters": [ + "--variant", + "host_debug", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] + }, + { + "name": "Mac Impeller-golden, dart and engine tests for host_release", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_release" + ], + "test_dependencies": [ + { + "dependency": "goldctl", + "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603" + } + ], + "tasks": [ + { + "language": "python3", + "name": "Impeller-golden, dart and engine tests for host_release", + "parameters": [ + "--variant", + "host_release", + "--type", + "dart,engine,impeller-golden" + ], + "script": "flutter/testing/run_tests.py" + } + ] + }, + { + "name": "Mac Host Tests for host_profile", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_profile" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_profile", + "parameters": [ + "--variant", + "host_profile", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] + } ] } diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index ec58321c7fc22..51ae3a9375dc2 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,7 +3,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -26,7 +25,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -50,7 +48,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -74,7 +71,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -99,7 +95,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 1be5de70ffcab..b6f5fc25881bf 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -1,19 +1,9 @@ { "builds": [ { - "archives": [ - { - "base_path": "out/host_debug_unopt/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "host_debug_unopt" - } - ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -34,31 +24,9 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_debug_unopt", - "parameters": [ - "--variant", - "host_debug_unopt", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { - "archives": [ - { - "base_path": "out/ios_debug_sim/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "ios_debug_sim" - } - ], "properties": { "$flutter/osx_sdk": { "runtime_versions": [ @@ -70,8 +38,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -90,64 +57,29 @@ "flutter/testing/scenario_app", "flutter/shell/platform/darwin/ios:ios_test_flutter" ] - }, - "tests": [ - { - "language": "python3", - "name": "Tests for ios_debug_sim", - "parameters": [ - "--variant", - "ios_debug_sim", - "--type", - "objc", - "--engine-capture-core-dump", - "--ios-variant", - "ios_debug_sim" - ], - "script": "flutter/testing/run_tests.py" - }, - { - "name": "Scenario App Integration Tests", - "parameters": [ - "ios_debug_sim" - ], - "script": "flutter/testing/scenario_app/run_ios_tests.sh" - } - ] + } }, { - "archives": [ - { - "base_path": "out/host_debug_unopt_arm64/zip_archives/", - "type": "gcs", - "include_paths": [ - ], - "name": "host_debug_unopt_arm64" - } - ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false }, "gn": [ - "--runtime-mode", - "debug", - "--unoptimized", - "--no-lto", - "--prebuilt-dart-sdk", - "--force-mac-arm64", - "--mac-cpu", - "arm64" + "--runtime-mode", + "debug", + "--unoptimized", + "--no-lto", + "--prebuilt-dart-sdk", + "--force-mac-arm64", + "--mac-cpu", + "arm64" ], "name": "host_debug_unopt_arm64", "ninja": { - "config": "host_debug_unopt_arm64", - "targets": [ - ] + "config": "host_debug_unopt_arm64" }, "properties": { "$flutter/osx_sdk": { @@ -156,15 +88,6 @@ } }, { - "archives": [ - { - "base_path": "out/ios_debug_sim_arm64/zip_archives/", - "type": "gcs", - "include_paths": [ - ], - "name": "ios_debug_sim_arm64" - } - ], "properties": { "$flutter/osx_sdk": { "runtime_versions": [ @@ -176,8 +99,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -199,41 +121,127 @@ "flutter/testing/scenario_app", "flutter/shell/platform/darwin/ios:ios_test_flutter" ] + } + }, + { + "properties": { + "$flutter/osx_sdk": { + "runtime_versions": [ + "ios-16-4_14e300c", + "ios-16-2_14c18" + ], + "sdk_version": "14e300c" + } + }, + "drone_dimensions": [ + "device_type=none", + "os=Mac-12" + ], + "gclient_variables": { + "download_android_deps": false + }, + "gn": [ + "--ios", + "--runtime-mode", + "debug", + "--simulator", + "--no-lto", + "--force-mac-arm64", + "--simulator-cpu", + "arm64", + "--darwin-extension-safe" + ], + "name": "ios_debug_sim_arm64_extension_safe", + "ninja": { + "config": "ios_debug_sim_arm64_extension_safe", + "targets": [ + "flutter/testing/scenario_app", + "flutter/shell/platform/darwin/ios:ios_test_flutter" + ] + } + } + ], + "tests": [ + { + "name": "Mac Host Tests for host_debug_unopt", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_debug_unopt" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_debug_unopt", + "parameters": [ + "--variant", + "host_debug_unopt", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] + }, + { + "name": "Mac Tests for ios_debug_sim", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12" + ], + "gclient_variables": { + "download_android_deps": false }, + "dependencies": [ + "ios_debug_sim" + ], "tests": [ { "language": "python3", - "name": "Tests for ios_debug_sim_arm64", + "name": "Tests for ios_debug_sim", "parameters": [ "--variant", - "ios_debug_sim_arm64", + "ios_debug_sim", "--type", "objc", "--engine-capture-core-dump", "--ios-variant", - "ios_debug_sim_arm64" + "ios_debug_sim" ], "script": "flutter/testing/run_tests.py" }, { "name": "Scenario App Integration Tests", "parameters": [ - "ios_debug_sim_arm64" + "ios_debug_sim" ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } - ] }, { - "archives": [ - { - "base_path": "out/ios_debug_sim_arm64_extension_safe/zip_archives/", - "type": "gcs", - "include_paths": [ - ], - "name": "ios_debug_sim_arm64_extension_safe" - } + "name": "Mac Tests for ios_debug_sim_arm64", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "ios_debug_sim_arm64" + ], + "contexts": [ + "osx_sdk" ], "properties": { "$flutter/osx_sdk": { @@ -244,33 +252,43 @@ "sdk_version": "14e300c" } }, + "tasks": [ + { + "language": "python3", + "name": "Tests for ios_debug_sim_arm64", + "parameters": [ + "--variant", + "ios_debug_sim_arm64", + "--type", + "objc", + "--engine-capture-core-dump", + "--ios-variant", + "ios_debug_sim_arm64" + ], + "script": "flutter/testing/run_tests.py" + }, + { + "name": "Scenario App Integration Tests", + "parameters": [ + "ios_debug_sim_arm64" + ], + "script": "flutter/testing/scenario_app/run_ios_tests.sh" + } + ] + }, + { + "name": "Mac Tests for ios_debug_sim_arm64_extension_safe", + "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false }, - "gn": [ - "--ios", - "--runtime-mode", - "debug", - "--simulator", - "--no-lto", - "--force-mac-arm64", - "--simulator-cpu", - "arm64", - "--darwin-extension-safe" + "dependencies": [ + "ios_debug_sim_arm64_extension_safe" ], - "name": "ios_debug_sim_arm64_extension_safe", - "ninja": { - "config": "ios_debug_sim_arm64_extension_safe", - "targets": [ - "flutter/testing/scenario_app", - "flutter/shell/platform/darwin/ios:ios_test_flutter" - ] - }, "tests": [ { "language": "python3", @@ -293,7 +311,6 @@ ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } - ] } ]