[iOS][infra] Fix ToTiOSDevice and ToTiOS machine OS in config.

The assigned machine is in mac 10.14 so os can't be os.MAC_10_15. This
is to fix the infra failures caused by this wrong config.

bug: 1085198
Change-Id: Ia8a64508045f3fb7ee8b021d61f97faf7755ecba
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211043
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770800}

infra/config/generated/cr-buildbucket.cfg

@@ -7243,7 +7243,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:1"
       recipe: <
@@ -7253,12 +7253,12 @@ buckets: <
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.clang\""
         properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
-        properties_j: "xcode_build_version:\"11e146\""
+        properties_j: "xcode_build_version:\"11c29\""
       >
       execution_timeout_secs: 43200
       caches: <
-        name: "xcode_ios_11e146"
-        path: "xcode_ios_11e146.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -7278,7 +7278,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:1"
       recipe: <
@@ -7288,12 +7288,12 @@ buckets: <
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.clang\""
         properties_j: "perf_dashboard_machine_group:\"ChromiumClang\""
-        properties_j: "xcode_build_version:\"11e146\""
+        properties_j: "xcode_build_version:\"11c29\""
       >
       execution_timeout_secs: 43200
       caches: <
-        name: "xcode_ios_11e146"
-        path: "xcode_ios_11e146.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"

infra/config/subprojects/chromium/master-only/ci.star

@@ -784,30 +784,30 @@ ci.clang_builder(
 
 ci.clang_builder(
     name = 'ToTiOS',
-    caches = [xcode_cache.x11e146],
+    caches = [xcode_cache.x11c29],
     console_view_entry = ci.console_view_entry(
         category = 'iOS|public',
         short_name = 'sim',
     ),
     cores = None,
-    os = os.MAC_10_15,
+    os = os.MAC_ANY,
     properties = {
-        'xcode_build_version': '11e146'
+        'xcode_build_version': '11c29'
     },
     ssd=True
 )
 
 ci.clang_builder(
     name = 'ToTiOSDevice',
-    caches = [xcode_cache.x11e146],
+    caches = [xcode_cache.x11c29],
     console_view_entry = ci.console_view_entry(
         category = 'iOS|public',
         short_name = 'dev',
     ),
     cores = None,
-    os = os.MAC_10_15,
+    os = os.MAC_ANY,
     properties = {
-        'xcode_build_version': '11e146'
+        'xcode_build_version': '11c29'
     },
     ssd=True
 )