Move m1 tests to mac/android
Tests `integration_test_test` and `hello_world_android__compile` are expected android sdk and java. Migrating them to mac/android, and led runs are passing:
https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/keyonghan_google.com/e9c9b5543899b315fb7f3f4e1c0c332e0958734046cb84d355f4b86f71eebf4f/+/build.proto
https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/keyonghan_google.com/ec5b59a87e3269d221abf14232ef4734bd22550c6f9cf3bbfe9fa9ac9ec6cae8/+/build.proto
Change-Id: I1588a1d78d40cf5bb466b21c703491248032c50d
Bug: https://github.com/flutter/flutter/issues/87508
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/28984
Reviewed-by: Jenn Magder <magder@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index c12aedb..f7d9829 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -234,7 +234,7 @@
pool = "luci.flutter.staging",
os = MAC_OS,
category = "Mac_ios",
- dimensions = {"device_os": IOS_VERSION},
+ dimensions = {"device_os": IOS_VERSION, "cpu": "x86"},
execution_timeout = timeout.LONG,
expiration_timeout = timeout.LONG_EXPIRATION,
caches = MAC_DEFAULT_CACHES,
@@ -278,7 +278,7 @@
pool = "luci.flutter.staging",
os = MAC_OS,
category = "Mac_android",
- dimensions = {"device_os": "N"},
+ dimensions = {"device_os": "N", "cpu": "x86"},
expiration_timeout = timeout.LONG_EXPIRATION,
execution_timeout = timeout.SHORT,
caches = MAC_ANDROID_DEFAULT_CACHES,
@@ -305,7 +305,7 @@
pool = "luci.flutter.staging",
caches = MAC_DEFAULT_CACHES,
os = "Mac",
- dimensions = {"device_os": "none"},
+ dimensions = {"device_os": "none", "cpu": "x86"},
)
# TODO(keyonghan): add "build_aar_module_test" when arm64 android sdk is ready in cipd,
@@ -321,8 +321,6 @@
"plugin_lint_mac",
"run_release_test",
"run_release_test_macos",
- "integration_test_test",
- "hello_world_android__compile",
"ios_app_with_extensions_test",
"ios_content_validation_test",
"macos_chrome_dev_mode",
@@ -350,7 +348,7 @@
"dependency": "ios_signing",
},
],
- "tags": ["hostonly", "mac", "arm64"],
+ "tags": ["ios", "mac", "arm64"],
"task_name": task,
"git_branch": DEFAULT_BRANCH,
"use_cas": True,
@@ -363,7 +361,44 @@
os = MAC_OS,
# Host only mac bots are maintained by chromium team, where code signing is not easy
# to control. This is to enable tests via ios signing from devicelab bots.
- dimensions = {"device_os": IOS_VERSION, "mac_model": "Macmini9,1"},
+ dimensions = {"device_os": IOS_VERSION, "cpu": "arm64"},
+ )
+
+ mac_arm64_android_tasks = [
+ "integration_test_test",
+ "hello_world_android__compile",
+ ]
+
+ for task in mac_arm64_android_tasks:
+ common.mac_prod_builder(
+ name = "Mac_arm64_android_staging %s|%s" % (task, common.short_name(task)),
+ recipe = drone_recipe_name,
+ console_view_name = console_view_name,
+ triggered_by = [trigger_name],
+ triggering_policy = triggering_policy,
+ properties = {
+ "dependencies": [
+ {
+ "dependency": "android_sdk",
+ "version": "version:31v1",
+ },
+ {
+ "dependency": "open_jdk",
+ "version": "version:11",
+ },
+ ],
+ "tags": ["android", "mac", "arm64"],
+ "task_name": task,
+ "git_branch": DEFAULT_BRANCH,
+ "use_cas": True,
+ "upload_metrics": True,
+ },
+ category = "Mac_arm64",
+ bucket = "staging",
+ pool = "luci.flutter.staging",
+ caches = MAC_DEFAULT_CACHES,
+ os = MAC_OS,
+ dimensions = {"device_os": "N", "cpu": "arm64"},
)
# Linux prod builders.
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index a00d540..5253518 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -198290,6 +198290,7 @@
builders {
name: "Mac_android_staging drive_perf_debug_warning"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198381,6 +198382,7 @@
builders {
name: "Mac_android_staging hello_world_android__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198472,6 +198474,7 @@
builders {
name: "Mac_android_staging hot_mode_dev_cycle__benchmark"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198563,6 +198566,7 @@
builders {
name: "Mac_android_staging integration_test_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198654,6 +198658,7 @@
builders {
name: "Mac_android_staging integration_ui_frame_number"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198745,6 +198750,7 @@
builders {
name: "Mac_android_staging run_release_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:N"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -198834,10 +198840,180 @@
}
}
builders {
+ name: "Mac_arm64_android_staging hello_world_android__compile"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
+ dimensions: "device_os:N"
+ dimensions: "os:Mac-12"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$fuchsia/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$kitchen": {'
+ ' "emulate_gce": true'
+ ' },'
+ ' "$recipe_engine/isolated": {'
+ ' "server": "https://isolateserver.appspot.com"'
+ ' },'
+ ' "$recipe_engine/swarming": {'
+ ' "server": "https://chromium-swarm.appspot.com"'
+ ' },'
+ ' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "android_sdk",'
+ ' "version": "version:31v1"'
+ ' },'
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:11"'
+ ' }'
+ ' ],'
+ ' "git_branch": "master",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "recipe": "devicelab/devicelab_drone",'
+ ' "tags": ['
+ ' "android",'
+ ' "mac",'
+ ' "arm64"'
+ ' ],'
+ ' "task_name": "hello_world_android__compile",'
+ ' "upload_metrics": true,'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab_staging"
+ path: "builder"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
+ build_numbers: YES
+ service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {}
+ experiments {
+ key: "luci.buildbucket.agent.cipd_installation"
+ value: 0
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
+ name: "Mac_arm64_android_staging integration_test_test"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
+ dimensions: "device_os:N"
+ dimensions: "os:Mac-12"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$fuchsia/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$kitchen": {'
+ ' "emulate_gce": true'
+ ' },'
+ ' "$recipe_engine/isolated": {'
+ ' "server": "https://isolateserver.appspot.com"'
+ ' },'
+ ' "$recipe_engine/swarming": {'
+ ' "server": "https://chromium-swarm.appspot.com"'
+ ' },'
+ ' "clobber": false,'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "android_sdk",'
+ ' "version": "version:31v1"'
+ ' },'
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:11"'
+ ' }'
+ ' ],'
+ ' "git_branch": "master",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "recipe": "devicelab/devicelab_drone",'
+ ' "tags": ['
+ ' "android",'
+ ' "mac",'
+ ' "arm64"'
+ ' ],'
+ ' "task_name": "integration_test_test",'
+ ' "upload_metrics": true,'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ execution_timeout_secs: 3600
+ caches {
+ name: "builder_mac_devicelab_staging"
+ path: "builder"
+ }
+ caches {
+ name: "flutter_sdk"
+ path: "flutter sdk"
+ }
+ caches {
+ name: "osx_sdk"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ caches {
+ name: "xcode_binary"
+ path: "xcode_binary"
+ }
+ build_numbers: YES
+ service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {}
+ experiments {
+ key: "luci.buildbucket.agent.cipd_installation"
+ value: 0
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac_arm64_staging build_ios_framework_module_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -198880,7 +199056,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -198925,8 +199101,8 @@
builders {
name: "Mac_arm64_staging flutter_gallery_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -198969,7 +199145,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199012,99 +199188,10 @@
}
}
builders {
- name: "Mac_arm64_staging hello_world_android__compile"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
- dimensions: "os:Mac-12"
- dimensions: "pool:luci.flutter.staging"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/devicelab_osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
- ' "$fuchsia/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "xcode"'
- ' },'
- ' {'
- ' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "ios_signing"'
- ' }'
- ' ],'
- ' "git_branch": "master",'
- ' "gold_tryjob": false,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "recipe": "devicelab/devicelab_drone",'
- ' "tags": ['
- ' "hostonly",'
- ' "mac",'
- ' "arm64"'
- ' ],'
- ' "task_name": "hello_world_android__compile",'
- ' "upload_metrics": true,'
- ' "upload_packages": true,'
- ' "use_cas": true'
- '}'
- execution_timeout_secs: 3600
- caches {
- name: "builder_mac_devicelab_staging"
- path: "builder"
- }
- caches {
- name: "flutter_sdk"
- path: "flutter sdk"
- }
- caches {
- name: "osx_sdk"
- path: "osx_sdk"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- caches {
- name: "xcode_binary"
- path: "xcode_binary"
- }
- build_numbers: YES
- service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.buildbucket.agent.cipd_installation"
- value: 0
- }
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Mac_arm64_staging hello_world_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199147,7 +199234,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199192,8 +199279,8 @@
builders {
name: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199236,7 +199323,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199279,99 +199366,10 @@
}
}
builders {
- name: "Mac_arm64_staging integration_test_test"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
- dimensions: "os:Mac-12"
- dimensions: "pool:luci.flutter.staging"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/devicelab_osx_sdk": {'
- ' "sdk_version": "13a233"'
- ' },'
- ' "$fuchsia/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "xcode"'
- ' },'
- ' {'
- ' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "ios_signing"'
- ' }'
- ' ],'
- ' "git_branch": "master",'
- ' "gold_tryjob": false,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "recipe": "devicelab/devicelab_drone",'
- ' "tags": ['
- ' "hostonly",'
- ' "mac",'
- ' "arm64"'
- ' ],'
- ' "task_name": "integration_test_test",'
- ' "upload_metrics": true,'
- ' "upload_packages": true,'
- ' "use_cas": true'
- '}'
- execution_timeout_secs: 3600
- caches {
- name: "builder_mac_devicelab_staging"
- path: "builder"
- }
- caches {
- name: "flutter_sdk"
- path: "flutter sdk"
- }
- caches {
- name: "osx_sdk"
- path: "osx_sdk"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- caches {
- name: "xcode_binary"
- path: "xcode_binary"
- }
- build_numbers: YES
- service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.buildbucket.agent.cipd_installation"
- value: 0
- }
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Mac_arm64_staging ios_app_with_extensions_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199414,7 +199412,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199459,8 +199457,8 @@
builders {
name: "Mac_arm64_staging ios_content_validation_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199503,7 +199501,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199548,8 +199546,8 @@
builders {
name: "Mac_arm64_staging macos_chrome_dev_mode"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199592,7 +199590,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199637,8 +199635,8 @@
builders {
name: "Mac_arm64_staging module_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199681,7 +199679,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199726,8 +199724,8 @@
builders {
name: "Mac_arm64_staging native_ui_tests_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199770,7 +199768,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199815,8 +199813,8 @@
builders {
name: "Mac_arm64_staging native_ui_tests_macos"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199859,7 +199857,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199904,8 +199902,8 @@
builders {
name: "Mac_arm64_staging plugin_lint_mac"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -199948,7 +199946,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -199993,8 +199991,8 @@
builders {
name: "Mac_arm64_staging run_release_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -200037,7 +200035,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -200082,8 +200080,8 @@
builders {
name: "Mac_arm64_staging run_release_test_macos"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:arm64"
dimensions: "device_os:iOS-15.1"
- dimensions: "mac_model:Macmini9,1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
exe {
@@ -200126,7 +200124,7 @@
' "mastername": "client.flutter",'
' "recipe": "devicelab/devicelab_drone",'
' "tags": ['
- ' "hostonly",'
+ ' "ios",'
' "mac",'
' "arm64"'
' ],'
@@ -209141,6 +209139,7 @@
builders {
name: "Mac_ios flutter_gallery__transition_perf_e2e_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -209449,6 +209448,7 @@
builders {
name: "Mac_ios flutter_gallery_ios__transition_perf"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -209539,6 +209539,7 @@
builders {
name: "Mac_ios flutter_gallery_ios_sksl_warmup__transition_perf"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217154,6 +217155,7 @@
builders {
name: "Mac_ios_staging animation_with_microtasks_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217244,6 +217246,7 @@
builders {
name: "Mac_ios_staging backdrop_filter_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217334,6 +217337,7 @@
builders {
name: "Mac_ios_staging basic_material_app_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217424,6 +217428,7 @@
builders {
name: "Mac_ios_staging channels_integration_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217514,6 +217519,7 @@
builders {
name: "Mac_ios_staging complex_layout_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217604,6 +217610,7 @@
builders {
name: "Mac_ios_staging complex_layout_ios__start_up"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217694,6 +217701,7 @@
builders {
name: "Mac_ios_staging complex_layout_scroll_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217784,6 +217792,7 @@
builders {
name: "Mac_ios_staging external_ui_integration_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217874,6 +217883,7 @@
builders {
name: "Mac_ios_staging flavors_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -217964,6 +217974,7 @@
builders {
name: "Mac_ios_staging flutter_gallery_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218054,6 +218065,7 @@
builders {
name: "Mac_ios_staging flutter_gallery_ios__start_up"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218144,6 +218156,7 @@
builders {
name: "Mac_ios_staging flutter_view_ios__start_up"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218234,6 +218247,7 @@
builders {
name: "Mac_ios_staging hello_world_ios__compile"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218324,6 +218338,7 @@
builders {
name: "Mac_ios_staging hot_mode_dev_cycle_macos_target__benchmark"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218414,6 +218429,7 @@
builders {
name: "Mac_ios_staging integration_test_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218504,6 +218520,7 @@
builders {
name: "Mac_ios_staging integration_ui_ios_driver"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218594,6 +218611,7 @@
builders {
name: "Mac_ios_staging integration_ui_ios_frame_number"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218684,6 +218702,7 @@
builders {
name: "Mac_ios_staging integration_ui_ios_keyboard_resize"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218774,6 +218793,7 @@
builders {
name: "Mac_ios_staging integration_ui_ios_screenshot"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218864,6 +218884,7 @@
builders {
name: "Mac_ios_staging integration_ui_ios_textfield"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -218954,6 +218975,7 @@
builders {
name: "Mac_ios_staging ios_app_with_extensions_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219044,6 +219066,7 @@
builders {
name: "Mac_ios_staging ios_content_validation_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219134,6 +219157,7 @@
builders {
name: "Mac_ios_staging ios_defines_test"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219224,6 +219248,7 @@
builders {
name: "Mac_ios_staging ios_platform_view_tests"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219314,6 +219339,7 @@
builders {
name: "Mac_ios_staging large_image_changer_perf_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219404,6 +219430,7 @@
builders {
name: "Mac_ios_staging macos_chrome_dev_mode"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219494,6 +219521,7 @@
builders {
name: "Mac_ios_staging microbenchmarks_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219584,6 +219612,7 @@
builders {
name: "Mac_ios_staging new_gallery_ios__transition_perf"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219674,6 +219703,7 @@
builders {
name: "Mac_ios_staging platform_channel_sample_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219764,6 +219794,7 @@
builders {
name: "Mac_ios_staging platform_channel_sample_test_swift"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219854,6 +219885,7 @@
builders {
name: "Mac_ios_staging platform_interaction_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -219944,6 +219976,7 @@
builders {
name: "Mac_ios_staging platform_view_ios__start_up"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220034,6 +220067,7 @@
builders {
name: "Mac_ios_staging platform_views_scroll_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220124,6 +220158,7 @@
builders {
name: "Mac_ios_staging post_backdrop_filter_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220214,6 +220249,7 @@
builders {
name: "Mac_ios_staging simple_animation_perf_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220304,6 +220340,7 @@
builders {
name: "Mac_ios_staging smoke_catalina_hot_mode_dev_cycle_ios__benchmark"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220394,6 +220431,7 @@
builders {
name: "Mac_ios_staging tiles_scroll_perf_ios__timeline_summary"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:iOS-15.1"
dimensions: "os:Mac-12"
dimensions: "pool:luci.flutter.staging"
@@ -220484,6 +220522,7 @@
builders {
name: "Mac_staging plugin_test_ios"
swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
dimensions: "device_os:none"
dimensions: "os:Mac"
dimensions: "pool:luci.flutter.staging"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 92c8be1..2787b14 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -368,16 +368,6 @@
short_name: "rrtm"
}
builders {
- name: "buildbucket/luci.flutter.staging/Mac_arm64_staging integration_test_test"
- category: "Mac_arm64"
- short_name: "itt"
- }
- builders {
- name: "buildbucket/luci.flutter.staging/Mac_arm64_staging hello_world_android__compile"
- category: "Mac_arm64"
- short_name: "hwac"
- }
- builders {
name: "buildbucket/luci.flutter.staging/Mac_arm64_staging ios_app_with_extensions_test"
category: "Mac_arm64"
short_name: "iawet"
@@ -393,6 +383,16 @@
short_name: "mcdm"
}
builders {
+ name: "buildbucket/luci.flutter.staging/Mac_arm64_android_staging integration_test_test"
+ category: "Mac_arm64"
+ short_name: "itt"
+ }
+ builders {
+ name: "buildbucket/luci.flutter.staging/Mac_arm64_android_staging hello_world_android__compile"
+ category: "Mac_arm64"
+ short_name: "hwac"
+ }
+ builders {
name: "buildbucket/luci.flutter.staging/Linux_android_staging android_obfuscate_test"
category: "Linux_android"
short_name: "aot"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index 55abf80..22020c6 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -11586,6 +11586,36 @@
}
}
job {
+ id: "Mac_arm64_android_staging hello_world_android__compile"
+ realm: "staging"
+ acl_sets: "staging"
+ triggering_policy {
+ kind: GREEDY_BATCHING
+ max_concurrent_invocations: 1
+ max_batch_size: 20
+ }
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "staging"
+ builder: "Mac_arm64_android_staging hello_world_android__compile"
+ }
+}
+job {
+ id: "Mac_arm64_android_staging integration_test_test"
+ realm: "staging"
+ acl_sets: "staging"
+ triggering_policy {
+ kind: GREEDY_BATCHING
+ max_concurrent_invocations: 1
+ max_batch_size: 20
+ }
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "staging"
+ builder: "Mac_arm64_android_staging integration_test_test"
+ }
+}
+job {
id: "Mac_arm64_staging build_ios_framework_module_test"
realm: "staging"
acl_sets: "staging"
@@ -11616,21 +11646,6 @@
}
}
job {
- id: "Mac_arm64_staging hello_world_android__compile"
- realm: "staging"
- acl_sets: "staging"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 1
- max_batch_size: 20
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "staging"
- builder: "Mac_arm64_staging hello_world_android__compile"
- }
-}
-job {
id: "Mac_arm64_staging hello_world_ios__compile"
realm: "staging"
acl_sets: "staging"
@@ -11661,21 +11676,6 @@
}
}
job {
- id: "Mac_arm64_staging integration_test_test"
- realm: "staging"
- acl_sets: "staging"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 1
- max_batch_size: 20
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "staging"
- builder: "Mac_arm64_staging integration_test_test"
- }
-}
-job {
id: "Mac_arm64_staging ios_app_with_extensions_test"
realm: "staging"
acl_sets: "staging"
@@ -17825,12 +17825,12 @@
triggers: "Mac_android_staging integration_test_test"
triggers: "Mac_android_staging integration_ui_frame_number"
triggers: "Mac_android_staging run_release_test"
+ triggers: "Mac_arm64_android_staging hello_world_android__compile"
+ triggers: "Mac_arm64_android_staging integration_test_test"
triggers: "Mac_arm64_staging build_ios_framework_module_test"
triggers: "Mac_arm64_staging flutter_gallery_ios__compile"
- triggers: "Mac_arm64_staging hello_world_android__compile"
triggers: "Mac_arm64_staging hello_world_ios__compile"
triggers: "Mac_arm64_staging hot_mode_dev_cycle_macos_target__benchmark"
- triggers: "Mac_arm64_staging integration_test_test"
triggers: "Mac_arm64_staging ios_app_with_extensions_test"
triggers: "Mac_arm64_staging ios_content_validation_test"
triggers: "Mac_arm64_staging macos_chrome_dev_mode"
