From ec7fa0723bad5c66c1a381c0cdfd6de40b9ae70d Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Fri, 25 Aug 2023 12:11:48 -0700 Subject: [PATCH] Revert "Fix global tests doing nothing. (#45097)" This reverts commit 52e8f5f3676ee3630f1924be672ae3c142d8b1b6. --- ci/builders/mac_android_aot_engine.json | 18 +- ci/builders/mac_host_engine.json | 162 +++++-------- ci/builders/mac_ios_engine.json | 5 + ci/builders/mac_unopt.json | 298 ++++++++++-------------- 4 files changed, 203 insertions(+), 280 deletions(-) diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index ecf59f5fb6070..20dd187c19775 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -14,7 +14,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -52,7 +53,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -91,7 +93,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -130,7 +133,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -168,7 +172,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -207,7 +212,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 87b3f48e0a0cf..cc3a336302a50 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,7 +15,9 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86", + "mac_model=Macmini8,1" ], "gclient_variables": { "download_android_deps": false @@ -47,7 +49,21 @@ "$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": [ @@ -63,7 +79,9 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86", + "mac_model=Macmini8,1" ], "gclient_variables": { "download_android_deps": false @@ -90,7 +108,21 @@ "$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": [ @@ -107,7 +139,9 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86", + "mac_model=Macmini8,1" ], "dependencies": [ { @@ -144,7 +178,20 @@ "$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": [ @@ -161,7 +208,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -207,7 +255,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -250,7 +299,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -426,99 +476,5 @@ "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 51ae3a9375dc2..ec58321c7fc22 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,6 +3,7 @@ { "drone_dimensions": [ "device_type=none", + "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -25,6 +26,7 @@ { "drone_dimensions": [ "device_type=none", + "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -48,6 +50,7 @@ { "drone_dimensions": [ "device_type=none", + "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -71,6 +74,7 @@ { "drone_dimensions": [ "device_type=none", + "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -95,6 +99,7 @@ { "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 42be0e3b6ee32..4d372bc615424 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -1,9 +1,19 @@ { "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" + "os=Mac-12", + "cpu=x86", + "mac_model=Macmini8,1" ], "gclient_variables": { "download_android_deps": false @@ -25,9 +35,31 @@ "$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": [ @@ -40,7 +72,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -59,29 +91,64 @@ "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" + "os=Mac-12", + "cpu=arm64" ], "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" + "config": "host_debug_unopt_arm64", + "targets": [ + ] }, "properties": { "$flutter/osx_sdk": { @@ -90,6 +157,15 @@ } }, { + "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": [ @@ -101,7 +177,8 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -123,141 +200,41 @@ "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", - "cpu=x86" - ], - "gclient_variables": { - "download_android_deps": false - }, - "dependencies": [ - "ios_debug_sim" - ], - "contexts": [ - "osx_sdk" - ], - "properties": { - "$flutter/osx_sdk": { - "runtime_versions": [ - "ios-16-4_14e300c", - "ios-16-2_14c18" - ], - "sdk_version": "14e300c" - } - }, - "tasks": [ + "tests": [ { "language": "python3", - "name": "Tests for ios_debug_sim", + "name": "Tests for ios_debug_sim_arm64", "parameters": [ "--variant", - "ios_debug_sim", + "ios_debug_sim_arm64", "--type", "objc", "--engine-capture-core-dump", "--ios-variant", - "ios_debug_sim" + "ios_debug_sim_arm64" ], "script": "flutter/testing/run_tests.py" }, { "name": "Scenario App Integration Tests", "parameters": [ - "ios_debug_sim" + "ios_debug_sim_arm64" ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } + ] }, { - "name": "Mac Tests for ios_debug_sim_arm64", - "recipe": "engine_v2/tester_engine", - "drone_dimensions": [ - "device_type=none", - "os=Mac-12", - "cpu=arm64" - ], - "gclient_variables": { - "download_android_deps": false - }, - "dependencies": [ - "ios_debug_sim_arm64" - ], - "contexts": [ - "osx_sdk" + "archives": [ + { + "base_path": "out/ios_debug_sim_arm64_extension_safe/zip_archives/", + "type": "gcs", + "include_paths": [ + ], + "name": "ios_debug_sim_arm64_extension_safe" + } ], "properties": { "$flutter/osx_sdk": { @@ -268,56 +245,34 @@ "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" + "os=Mac-12", + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false }, - "dependencies": [ - "ios_debug_sim_arm64_extension_safe" - ], - "contexts": [ - "osx_sdk" + "gn": [ + "--ios", + "--runtime-mode", + "debug", + "--simulator", + "--no-lto", + "--force-mac-arm64", + "--simulator-cpu", + "arm64", + "--darwin-extension-safe" ], - "properties": { - "$flutter/osx_sdk": { - "runtime_versions": [ - "ios-16-4_14e300c", - "ios-16-2_14c18" - ], - "sdk_version": "14e300c" - } + "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" + ] }, - "tasks": [ + "tests": [ { "language": "python3", "name": "Tests for ios_debug_sim_arm64_extension_safe", @@ -339,6 +294,7 @@ ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } + ] } ]