[ios/infra] xcode 11.4 roll to ios13-sdk-simulator

Steps:
- Introduced the xcode cache x11e146 in //infra/config/lib/builders.star
- The default xcode cache is set in //lib/ci.star under fyi_ios_builder
  definition, but we only want to roll ios13-sdk-simulator. Check that
  cache param is overridable, and override it with the newly introduced
  xcode_cache.x11e146. Update the properties so that the builder
  uses this too.
- 11e146 needs Mac OS 10.15. This definition did not support overriding
  the default OS, so OS param was introduced into fyi_ios_builder.
  Set OS for the builder to os.MAC_10_15.
- Trybot for ios13-sdk-sim is under //infra/config/buckets/try.star.
  - the definition is under //infra/lib/try.star, and didn't support
    overriding the default variables, so they've been included into
    the parameters.
  - //infra/config/buckets/try.star was missing the xcode_cache import,
    so this was appended.
  - same w/ the ci definition, adding the property too.
- Creating variants with 13.4 and updating all sim version usage for
    this bot from 13.3 to 13.4. 12.4 should be fat bundled.
- Updating xcode and xcode cache version for this bot by creating
  xcode_11e146 in mixins.pyl and apply that in waterfalls.pyl.

Bug: 1065456
Change-Id: I54e720efddc05a55ab69f485b9ceb55c1deafa59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134940
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758973}

infra/config/buckets/ci.star

@@ -2015,9 +2015,11 @@ ci.fyi_ios_builder(
         category = 'iOS|iOS13',
         short_name = 'sim',
     ),
+    caches = [xcode_cache.x11e146],
     executable = 'recipe:chromium',
+    os = os.MAC_10_15,
     properties = {
-        'xcode_build_version': '11c29'
+        'xcode_build_version': '11e146'
     }
 )
 

infra/config/buckets/try.star

-load('//lib/builders.star', 'cpu', 'goma', 'os')
+load('//lib/builders.star', 'cpu', 'goma', 'os', 'xcode_cache')
 load('//lib/try.star', 'try_')
 
 # Defaults that apply to all branch versions of the bucket
@@ -611,6 +611,11 @@ try_.chromium_mac_ios_builder(
 try_.chromium_mac_ios_builder(
     name = 'ios13-sdk-simulator',
     executable = 'recipe:chromium_trybot',
+    caches = [xcode_cache.x11e146],
+    os = os.MAC_10_15,
+    properties = {
+        'xcode_build_version': '11e146'
+    }
 )
 
 try_.chromium_win_builder(

infra/config/generated/cr-buildbucket.cfg

@@ -7230,7 +7230,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:ios13-sdk-simulator"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
+      dimensions: "os:Mac-10.15"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -7238,12 +7238,12 @@ buckets: <
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
-        properties_j: "xcode_build_version:\"11c29\""
+        properties_j: "xcode_build_version:\"11e146\""
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -17307,7 +17307,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:ios13-sdk-simulator"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
+      dimensions: "os:Mac-10.15"
       recipe: <
         name: "chromium_trybot"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17315,7 +17315,7 @@ buckets: <
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"tryserver.chromium.mac\""
-        properties_j: "xcode_build_version:\"11c29\""
+        properties_j: "xcode_build_version:\"11e146\""
       >
       execution_timeout_secs: 14400
       expiration_secs: 7200
@@ -17324,8 +17324,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11c29"
-        path: "xcode_ios_11c29.app"
+        name: "xcode_ios_11e146"
+        path: "xcode_ios_11e146.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"

infra/config/lib/builders.star

@@ -132,6 +132,7 @@ xcode_cache = struct(
    x11c505wk = xcode_enum('xcode_ios_11c505wk', 'xcode_ios_11c505wk.app'),
    x11c29 = xcode_enum('xcode_ios_11c29', 'xcode_ios_11c29.app'),
    x11m382q = xcode_enum('xcode_ios_11m382q', 'xcode_ios_11m382q.app'),
+   x11e146 = xcode_enum('xcode_ios_11e146', 'xcode_ios_11e146.app'),
 )
 
 

infra/config/lib/ci.star

@@ -557,6 +557,7 @@ def fyi_ios_builder(
     caches = None,
     executable='recipe:ios/unified_builder_tester',
     goma_backend=builders.goma.backend.RBE_PROD,
+    os = builders.os.MAC_ANY,
     **kwargs):
 
   if not caches:
@@ -567,7 +568,7 @@ def fyi_ios_builder(
       caches = caches,
       cores = None,
       executable = executable,
-      os = builders.os.MAC_ANY,
+      os = os,
       **kwargs
   )
 

infra/config/lib/try.star

@@ -266,22 +266,26 @@ def chromium_mac_builder(
 def chromium_mac_ios_builder(
     *,
     name,
+    caches=None,
     executable='recipe:ios/try',
     goma_backend=builders.goma.backend.RBE_PROD,
+    os=builders.os.MAC_ANY,
     properties=None,
     **kwargs):
+  if not caches:
+    caches = [builders.xcode_cache.x11c29]
   if not properties:
     properties = {
       'xcode_build_version': '11c29',
     }
   return try_builder(
       name = name,
-      caches = [builders.xcode_cache.x11c29],
+      caches = caches,
       cores = None,
       executable = executable,
       goma_backend = goma_backend,
       mastername = 'tryserver.chromium.mac',
-      os = builders.os.MAC_ANY,
+      os = os,
       properties = properties,
       **kwargs
   )

testing/buildbot/mixins.pyl

@@ -811,4 +811,20 @@
       ],
     },
   },
+  'xcode_11e146': {
+    '$mixin_append': {
+      'args': [
+        '--xcode-build-version',
+        '11e146'
+      ],
+    },
+    'swarming': {
+      'named_caches': [
+        {
+          'name': 'xcode_ios_11e146',
+          'path': 'Xcode.app',
+        },
+      ],
+    },
+  },
 }

testing/buildbot/test_suites.pyl

@@ -4718,7 +4718,7 @@
     'ios13_sdk_simulator_tests': {
       'ios_common_tests': {
         'variants': [
-          'SIM_IPHONE_6S_13_3',
+          'SIM_IPHONE_6S_13_4',
           'SIM_IPHONE_X_12_4',
         ],
       },
@@ -4730,16 +4730,16 @@
       },
       'ios_eg_cq_tests': {
         'variants': [
-          'SIM_IPHONE_X_13_3',
-          'SIM_IPAD_AIR_2_13_3',
+          'SIM_IPHONE_X_13_4',
+          'SIM_IPAD_AIR_2_13_4',
           'SIM_IPHONE_X_12_4',
           'SIM_IPAD_PRO_12_4',
         ]
       },
       'ios_eg_tests': {
         'variants': [
-          'SIM_IPHONE_7_13_3',
-          'SIM_IPAD_AIR_2_13_3',
+          'SIM_IPHONE_7_13_4',
+          'SIM_IPAD_AIR_2_13_4',
           'SIM_IPHONE_X_13_3',
           'SIM_IPHONE_X_12_4',
           'SIM_IPAD_AIR_3RD_GEN_12_4',
@@ -4747,8 +4747,8 @@
       },
       'ios_screen_size_dependent_tests': {
         'variants': [
-          'SIM_IPHONE_6S_PLUS_13_3',
-          'SIM_IPHONE_6S_13_3',
+          'SIM_IPHONE_6S_PLUS_13_4',
+          'SIM_IPHONE_6S_13_4',
           'SIM_IPHONE_6S_PLUS_12_4',
           'SIM_IPHONE_X_12_4',
           'SIM_IPAD_AIR_2_12_4',

testing/buildbot/variants.pyl

@@ -59,6 +59,15 @@
         ],
         'identifier': 'iPad Air 2 13.3'
     },
+    'SIM_IPAD_AIR_2_13_4': {
+        'args': [
+            '--platform',
+            'iPad Air 2',
+            '--version',
+            '13.4'
+        ],
+        'identifier': 'iPad Air 2 13.4'
+    },
     'SIM_IPAD_AIR_3RD_GEN_12_4': {
         'args': [
             '--platform',
@@ -131,6 +140,15 @@
         ],
         'identifier': 'iPhone 6s 13.3'
     },
+    'SIM_IPHONE_6S_13_4': {
+        'args': [
+            '--platform',
+            'iPhone 6s',
+            '--version',
+            '13.4',
+        ],
+        'identifier': 'iPhone 6s 13.4'
+    },
     'SIM_IPHONE_6S_PLUS_12_4': {
         'args': [
             '--platform',
@@ -149,6 +167,15 @@
         ],
         'identifier': 'iPhone 6s Plus 13.3'
     },
+    'SIM_IPHONE_6S_PLUS_13_4': {
+        'args': [
+            '--platform',
+            'iPhone 6s Plus',
+            '--version',
+            '13.4',
+        ],
+        'identifier': 'iPhone 6s Plus 13.4'
+    },
     'SIM_IPHONE_7_13_3': {
         'args': [
             '--platform',
@@ -158,6 +185,15 @@
         ],
         'identifier': 'iPhone 7 13.3'
     },
+    'SIM_IPHONE_7_13_4': {
+        'args': [
+            '--platform',
+            'iPhone 7',
+            '--version',
+            '13.4',
+        ],
+        'identifier': 'iPhone 7 13.4'
+    },
     'SIM_IPHONE_SE_13_3': {
         'args': [
             '--platform',
@@ -185,4 +221,13 @@
         ],
         'identifier': 'iPhone X 13.3'
     },
+    'SIM_IPHONE_X_13_4': {
+        'args': [
+            '--platform',
+            'iPhone X',
+            '--version',
+            '13.4',
+        ],
+        'identifier': 'iPhone X 13.4'
+    },
 }

testing/buildbot/waterfalls.pyl

@@ -1969,10 +1969,10 @@
           'all',
         ],
         'mixins': [
-          'mac_10.14',
+          'mac_10.15',
           'mac_toolchain',
           'out_dir_arg',
-          'xcode_11c29',
+          'xcode_11e146',
         ],
         'test_suites': {
           'isolated_scripts': 'ios13_sdk_simulator_tests'