Add "iOS Debug (simulator)" CI bot.

Also set xcode back to xcode 13 for iOS 14.

Change-Id: Ic5475d274895b5f86e4fea36805dec4486adc79b
Bug: b/264630045
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290894
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39094}

infra/config/config.star

@@ -741,6 +741,7 @@ ios_try_job("ios_compile_arm64_dbg")
 ios_builder("iOS64 Release", "iOS|arm64|rel")
 ios_try_job("ios_compile_arm64_rel")
 ios_try_job("ios_compile_arm64_rel_reclient", cq = {"experiment_percentage": 100})
+ios_builder("iOS Debug (simulator)", "iOS|x64|sim")
 ios_try_job("ios_dbg_simulator", cq = None)
 ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14")
 ios_try_job("ios_sim_x64_dbg_ios14")

infra/config/cr-buildbucket.cfg

@@ -1735,6 +1735,61 @@ buckets {
         }
       }
     }
+    builders {
+      name: "iOS Debug (simulator)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-trusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone",'
+        '  "xcode_build_version": "13c100"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_13c100"
+        path: "xcode_ios_13c100.app"
+      }
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
     builders {
       name: "iOS64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2140,6 +2195,7 @@ buckets {
         '          "Win64 Debug (Clang)",'
         '          "Win64 Release (Clang)",'
         '          "iOS API Framework Builder",'
+        '          "iOS Debug (simulator)",'
         '          "iOS64 Debug",'
         '          "iOS64 Release",'
         '          "iOS64 Sim Debug (iOS 12)",'

infra/config/luci-milo.cfg

@@ -66,6 +66,11 @@ consoles {
     category: "iOS|arm64"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.webrtc.ci/iOS Debug (simulator)"
+    category: "iOS|x64"
+    short_name: "sim"
+  }
   builders {
     name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 14)"
     category: "iOS|x64"

infra/config/luci-notify.cfg

@@ -922,6 +922,33 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "iOS Debug (simulator)"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE

infra/config/luci-scheduler.cfg

@@ -634,6 +634,16 @@ job {
     builder: "iOS API Framework Builder"
   }
 }
+job {
+  id: "iOS Debug (simulator)"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "iOS Debug (simulator)"
+  }
+}
 job {
   id: "iOS64 Debug"
   realm: "ci"
@@ -722,6 +732,7 @@ trigger {
   triggers: "Win64 Debug (Clang)"
   triggers: "Win64 Release (Clang)"
   triggers: "iOS API Framework Builder"
+  triggers: "iOS Debug (simulator)"
   triggers: "iOS64 Debug"
   triggers: "iOS64 Release"
   triggers: "iOS64 Sim Debug (iOS 12)"

infra/specs/variants.pyl

@@ -16,6 +16,7 @@
     ],
     'identifier': 'iPhone X 14.5',
     'mixins': [
+      'xcode_13_main',
       'ios_runtime_cache_14_5',
     ],
   },
@@ -28,6 +29,7 @@
     ],
     'identifier': 'iPhone X 15.5',
     'mixins': [
+      'xcode_14_main',
       'ios_runtime_cache_15_5',
     ],
   },
@@ -40,6 +42,7 @@
     ],
     'identifier': 'iPhone X 16.2',
     'mixins': [
+      'xcode_14_main',
       'ios_runtime_cache_16_2',
     ],
   },

infra/specs/waterfalls.pyl

@@ -224,6 +224,15 @@
           'isolated_scripts': 'desktop_tests_with_video_capture',
         },
       },
+      'iOS Debug (simulator)': {
+        'mixins': [
+          'mac_12_x64', 'chromium-tester-service-account', 'mac_toolchain',
+          'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
+        ],
+        'test_suites': {
+          'isolated_scripts': 'ios_simulator_tests_matrix',
+        },
+      },
       'iOS64 Debug': {},
       'iOS64 Release': {},
       'iOS64 Sim Debug (iOS 12)': {
@@ -466,9 +475,8 @@
       'ios_compile_arm64_rel': {},
       'ios_dbg_simulator': {
         'mixins': [
-          'mac_12_x64', 'chromium-tester-service-account', 'xcode_14_main',
+          'mac_12_x64', 'chromium-tester-service-account', 'mac_toolchain',
-          'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg',
+          'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
-          'webrtc-xctest'
         ],
         'test_suites': {
           'isolated_scripts': 'ios_simulator_tests_matrix',

tools_webrtc/mb/mb_config.pyl

@@ -99,6 +99,7 @@
       'Win64 Release (Clang)': 'win_clang_release_bot_x64',
 
       # iOS
+      'iOS Debug (simulator)': 'ios_debug_bot_x64',
       'iOS64 Debug': 'ios_debug_bot_arm64',
       'iOS64 Release': 'ios_release_bot_arm64',
       'iOS64 Sim Debug (iOS 12)': 'ios_debug_bot_x64',