commit 64171e7cdbb1ca0eb9f169cc820d54baf9e9d218
author Christopher Fujino <fujino@google.com> Fri Jan 28 18:08:21 2022 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 28 18:08:21 2022 +0000
tree a599448e2a8c5cd1a145513ebe8557403c6bb2d9
parent 10c0717aad26c167abb6ac0a7ae4533c8bdbf126

remove device_type:none

Today, the devicelab bots have a newer macOS version than the host-only bots (this is defined in the framework .ci.yaml file). The iostools builders require this newer version, thus remove `device_type: None` so that these builds will be able to use the devicelab bots.

Change-Id: I8b916387a8590abd6620327ee56b02418ee2a7eb
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/25960
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>

config/generated/flutter/luci/cr-buildbucket.cfg

diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 80544ec..633f95e 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -106385,7 +106385,6 @@
     builders {
       name: "ideviceinstaller"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -106511,7 +106510,6 @@
     builders {
       name: "ios-deploy"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -106637,7 +106635,6 @@
     builders {
       name: "libimobiledevice"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -106763,7 +106760,6 @@
     builders {
       name: "libplist"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -106889,7 +106885,6 @@
     builders {
       name: "libzip"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -107015,7 +107010,6 @@
     builders {
       name: "openssl"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -107693,7 +107687,6 @@
     builders {
       name: "usbmuxd"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
       dimensions: "os:Mac-12.0"
       dimensions: "pool:luci.flutter.prod"
       exe {

config/iostools_config.star

diff --git a/config/iostools_config.star b/config/iostools_config.star
index 8b47e19..d65892a 100644
--- a/config/iostools_config.star
+++ b/config/iostools_config.star
@@ -56,7 +56,6 @@
         repo = repo,
         recipe = "ios-usb-dependencies",
         console_view_name = builder,
-        dimensions = {"device_type": "none"},
         caches = ci_yaml.swarming_caches(ci_yaml_config, None, platform_key),
         properties = properties,
         os = platform_properties[platform_key]["os"],