Add ANGLE on iOS CI and trybot

Bug: angleproject:5417
Change-Id: I2c78b371221c332a0d1ff1340340c28c9547f085
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2618858Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841774}

infra/config/generated/commit-queue.cfg

@@ -886,6 +886,10 @@ config_groups {
         name: "chromium/try/gpu-try-win10-nvidia-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/ios-angle-try-intel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/ios-device"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -19765,6 +19765,118 @@ buckets {
         }
       }
     }
+    builders {
+      name: "ios-angle-builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-angle-builder"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.angle\",\"perf_dashboard_machine_group\":\"ChromiumANGLE\",\"recipe\":\"angle_chromium\",\"xcode_build_version\":\"12a7209\"}"
+      execution_timeout_secs: 10800
+      caches {
+        name: "xcode_ios_12a7209"
+        path: "xcode_ios_12a7209.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "ios-angle-intel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.angle\",\"perf_dashboard_machine_group\":\"ChromiumANGLE\",\"recipe\":\"angle_chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
     builders {
       name: "ios-asan"
       swarming_host: "chromium-swarm.appspot.com"
@@ -38218,6 +38330,67 @@ buckets {
         }
       }
     }
+    builders {
+      name: "ios-angle-try-intel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.gpu.mac.mini.intel.uhd630.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.angle\",\"recipe\":\"angle_chromium_trybot\",\"xcode_build_version\":\"12a7209\"}"
+      execution_timeout_secs: 7200
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      caches {
+        name: "xcode_ios_12a7209"
+        path: "xcode_ios_12a7209.app"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
     builders {
       name: "ios-device"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -3614,6 +3614,16 @@ consoles {
     category: "Mac|NVIDIA|ANGLE"
     short_name: "x64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-angle-builder"
+    category: "iOS|Builder|ANGLE"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios-angle-intel"
+    category: "iOS|Intel|ANGLE"
+    short_name: "x64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/win-angle-x64-builder"
     category: "Windows|Builder|ANGLE"
@@ -12576,6 +12586,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/gpu-try-win10-nvidia-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-angle-try-intel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-device"
   }
@@ -13305,6 +13318,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-angle-try-intel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-angle-rel"
   }

infra/config/generated/luci-scheduler.cfg

@@ -5070,6 +5070,30 @@ job {
     builder: "fuchsia-x64-dbg"
   }
 }
+job {
+  id: "ios-angle-builder"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-angle-builder"
+  }
+}
+job {
+  id: "ios-angle-intel"
+  realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-angle-intel"
+  }
+}
 job {
   id: "ios-asan"
   realm: "ci"
@@ -7086,6 +7110,7 @@ trigger {
   triggers: "fuchsia-official"
   triggers: "fuchsia-x64-cast"
   triggers: "fuchsia-x64-dbg"
+  triggers: "ios-angle-builder"
   triggers: "ios-asan"
   triggers: "ios-device"
   triggers: "ios-simulator"

infra/config/lib/try.star

@@ -235,6 +235,33 @@ def chromium_angle_builder(*, name, **kwargs):
         **kwargs
     )
 
+def chromium_angle_pinned_builder(*, name, **kwargs):
+    return try_builder(
+        name = name,
+        builder_group = "tryserver.chromium.angle",
+        builderless = True,
+        executable = "recipe:angle_chromium_trybot",
+        goma_backend = builders.goma.backend.RBE_PROD,
+        service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+        **kwargs
+    )
+
+def chromium_angle_mac_builder(*, name, **kwargs):
+    return chromium_angle_pinned_builder(
+        name = name,
+        cores = None,
+        ssd = None,
+        os = builders.os.MAC_ANY,
+        **kwargs
+    )
+
+def chromium_angle_ios_builder(*, name, **kwargs):
+    return chromium_angle_mac_builder(
+        name = name,
+        xcode = builders.xcode.x12a7209,
+        **kwargs
+    )
+
 def chromium_chromiumos_builder(*, name, **kwargs):
     return try_builder(
         name = name,
@@ -445,6 +472,8 @@ try_ = struct(
     chromium_builder = chromium_builder,
     chromium_android_builder = chromium_android_builder,
     chromium_angle_builder = chromium_angle_builder,
+    chromium_angle_ios_builder = chromium_angle_ios_builder,
+    chromium_angle_mac_builder = chromium_angle_mac_builder,
     chromium_chromiumos_builder = chromium_chromiumos_builder,
     chromium_dawn_builder = chromium_dawn_builder,
     chromium_linux_builder = chromium_linux_builder,

infra/config/subprojects/chromium/angle.try.star

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+load("//lib/builders.star", "cpu", "os")
+load("//lib/try.star", "try_")
+
+try_.defaults.set(
+    bucket = "try",
+    build_numbers = True,
+    caches = [
+        swarming.cache(
+            name = "win_toolchain",
+            path = "win_toolchain",
+        ),
+    ],
+    configure_kitchen = True,
+    cores = 8,
+    cpu = cpu.X86_64,
+    cq_group = "cq",
+    executable = "recipe:chromium_trybot",
+    execution_timeout = 2 * time.hour,
+    # Max. pending time for builds. CQ considers builds pending >2h as timed
+    # out: http://shortn/_8PaHsdYmlq. Keep this in sync.
+    expiration_timeout = 2 * time.hour,
+    os = os.LINUX_DEFAULT,
+    pool = "luci.chromium.try",
+    service_account = "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
+    subproject_list_view = "luci.chromium.try",
+    swarming_tags = ["vpython:native-python-wrapper"],
+    task_template_canary_percentage = 5,
+)
+
+try_.chromium_angle_ios_builder(
+    name = "ios-angle-try-intel",
+    pool = "luci.chromium.gpu.mac.mini.intel.uhd630.try",
+)

infra/config/subprojects/chromium/ci.star

@@ -134,7 +134,7 @@ consoles.console_view(
 consoles.console_view(
     name = "chromium.angle",
     ordering = {
-        None: ["Android", "AndroidVk", "Fuchsia", "Linux", "LinuxOzone", "Mac", "Windows", "Perf"],
+        None: ["Android", "AndroidVk", "Fuchsia", "Linux", "LinuxOzone", "Mac", "iOS", "Windows", "Perf"],
         "*builder*": ["Builder"],
         "Android": "*builder*",
         "AndroidVk": "*builder*",
@@ -142,6 +142,7 @@ consoles.console_view(
         "Linux": "*builder*",
         "LinuxOzone": "*builder*",
         "Mac": "*builder*",
+        "iOS": "*builder*",
         "Windows": "*builder*",
         "Perf": "*builder*",
     },
@@ -1328,6 +1329,24 @@ ci.angle_thin_tester(
     triggered_by = ["mac-angle-chromium-builder"],
 )
 
+ci.angle_mac_builder(
+    name = "ios-angle-builder",
+    xcode = xcode.x12a7209,
+    console_view_entry = consoles.console_view_entry(
+        category = "iOS|Builder|ANGLE",
+        short_name = "x64",
+    ),
+)
+
+ci.angle_thin_tester(
+    name = "ios-angle-intel",
+    console_view_entry = consoles.console_view_entry(
+        category = "iOS|Intel|ANGLE",
+        short_name = "x64",
+    ),
+    triggered_by = ["ios-angle-builder"],
+)
+
 ci.angle_windows_builder(
     name = "win-angle-chromium-x64-builder",
     console_view_entry = consoles.console_view_entry(

infra/config/subprojects/chromium/subproject.star

@@ -7,6 +7,7 @@ load("//lib/branches.star", "branches")
 exec("./ci.star")
 exec("./try.star")
 exec("./gpu.try.star")
+exec("./angle.try.star")
 exec("./swangle.try.star")
 
 # TODO(gbeaty) external_console_view uses new fields/types that aren't present

testing/buildbot/chromium.angle.json

@@ -858,6 +858,115 @@
       "angle_unittests"
     ]
   },
+  "ios-angle-builder": {},
+  "ios-angle-intel": {
+    "gtest_tests": [
+      {
+        "args": [
+          "angle_end2end_tests",
+          "--gtest_filter=-*Vulkan_SwiftShader*",
+          "--platform",
+          "iPhone X",
+          "--version",
+          "14.0",
+          "--bot-mode",
+          "--out-dir",
+          "${ISOLATED_OUTDIR}",
+          "--xcode-build-version",
+          "12a7209",
+          "--xctest"
+        ],
+        "isolate_profile_data": true,
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "angle_end2end_tests_iPhone X 14.0",
+        "resultdb": {
+          "enable": true
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/mac_toolchain/${platform}",
+              "location": ".",
+              "revision": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
+            }
+          ],
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "gpu": "8086:0a2e",
+              "os": "Mac-10.15.5"
+            }
+          ],
+          "named_caches": [
+            {
+              "name": "xcode_ios_12a7209",
+              "path": "Xcode.app"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_end2end_tests",
+        "test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_white_box_tests",
+          "--platform",
+          "iPhone X",
+          "--version",
+          "14.0",
+          "--bot-mode",
+          "--out-dir",
+          "${ISOLATED_OUTDIR}",
+          "--xcode-build-version",
+          "12a7209",
+          "--xctest"
+        ],
+        "isolate_profile_data": true,
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "angle_white_box_tests_iPhone X 14.0",
+        "resultdb": {
+          "enable": true
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/mac_toolchain/${platform}",
+              "location": ".",
+              "revision": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
+            }
+          ],
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "gpu": "8086:0a2e",
+              "os": "Mac-10.15.5"
+            }
+          ],
+          "named_caches": [
+            {
+              "name": "xcode_ios_12a7209",
+              "path": "Xcode.app"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_white_box_tests",
+        "test_id_prefix": "ninja://third_party/angle/src/tests:angle_white_box_tests/",
+        "use_isolated_scripts_api": true
+      }
+    ]
+  },
   "linux-angle-builder": {},
   "linux-angle-chromium-builder": {},
   "linux-angle-chromium-intel": {

testing/buildbot/test_suites.pyl

@@ -6423,6 +6423,19 @@
       },
     },
 
+    'gpu_angle_ios_gtests': {
+      'gpu_angle_end2end_gtests': {
+        'variants': [
+          'SIM_IPHONE_X_14_0',
+        ],
+      },
+      'gpu_angle_white_box_gtests': {
+        'variants': [
+          'SIM_IPHONE_X_14_0',
+        ],
+      },
+    },
+
     # ios14-beta-sim runs sims only on 14.0+ since
     # ios13-beta-sim already runs 13.x and 12.4
     'ios14_beta_simulator_tests': {

testing/buildbot/waterfalls.pyl

@@ -1318,6 +1318,22 @@
           'angle_unittests',
         ],
       },
+      'ios-angle-builder': {},
+      'ios-angle-intel': {
+        'os_type': 'mac',
+        'mixins': [
+          'mac_mini_intel_gpu_stable',
+          'enable_resultdb',
+          'isolate_profile_data',
+          'mac_toolchain',
+          'out_dir_arg',
+          'xcode_12a7209',
+          'xctest',
+        ],
+        'test_suites': {
+          'gtest_tests': 'gpu_angle_ios_gtests',
+        },
+      },
       'linux-angle-builder': {},
       'linux-angle-chromium-builder': {},
       'linux-angle-chromium-intel': {

tools/mb/mb_config.pyl

@@ -144,6 +144,7 @@
       'android-angle-vk-arm-builder': 'angle_specific_android_vulkan_ndk_release_trybot',
       'android-angle-vk-arm64-builder': 'angle_specific_android_vulkan_ndk_release_trybot_arm64',
       'fuchsia-angle-builder': 'angle_specific_release_trybot_fuchsia',
+      'ios-angle-builder': 'angle_specific_release_trybot_ios',
       'linux-angle-builder': 'angle_specific_release_trybot',
       'linux-angle-chromium-builder': 'gpu_tests_release_trybot',
       'linux-ozone-angle-builder': 'angle_specific_ozone_linux_system_gbm_libdrm_release_trybot',
@@ -857,6 +858,7 @@
       'android_angle_vk32_deqp_rel_ng': 'angle_deqp_android_vulkan_ndk_release_trybot',
       'android_angle_vk64_deqp_rel_ng': 'angle_deqp_android_vulkan_ndk_release_trybot_arm64',
       'fuchsia-angle-rel': 'gpu_fyi_tests_release_trybot_fuchsia',
+      'ios-angle-try-intel': 'angle_specific_release_trybot_ios',
       'linux-angle-rel': 'gpu_fyi_tests_release_trybot',
       'linux_angle_ozone_rel_ng': 'angle_ozone_linux_system_gbm_libdrm_release_trybot',
       'linux_angle_deqp_rel_ng': 'angle_deqp_release_trybot',
@@ -1520,6 +1522,10 @@
       'angle_specific_tests', 'shared_release_trybot', 'fuchsia',
     ],
 
+    'angle_specific_release_trybot_ios': [
+      'angle_specific_tests', 'shared_release_trybot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
+    ],
+
     'angle_specific_release_trybot_x86': [
       'angle_specific_tests', 'shared_release_trybot', 'x86',
     ],

tools/mb/mb_config_expectations/chromium.angle.json

@@ -89,6 +89,22 @@
       "use_goma": true
     }
   },
+  "ios-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_run_ios_unittests_with_xctest": true,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "target_environment": "simulator",
+      "target_os": "ios",
+      "use_goma": true
+    }
+  },
   "linux-angle-builder": {
     "gn_args": {
       "build_angle_deqp_tests": true,

tools/mb/mb_config_expectations/tryserver.chromium.angle.json

@@ -106,6 +106,22 @@
       "use_goma": true
     }
   },
+  "ios-angle-try-intel": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_run_ios_unittests_with_xctest": true,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "target_environment": "simulator",
+      "target_os": "ios",
+      "use_goma": true
+    }
+  },
   "linux-angle-rel": {
     "gn_args": {
       "build_angle_gles1_conform_tests": true,