Commit 1085ac05 authored by Simon Que's avatar Simon Que Committed by Commit Bot

infra: Migrate builders to Goma RBE (iOS Week 1d)

Only one CI/try builder pair: ios-simulator-code-coverage

Schedule of migration:
https://docs.google.com/spreadsheets/d/1TZhpasm6iceYm7zqkyEtZ1wn9ZcpREfH4LV4cusICJA/edit#gid=0

Bug: 950413
Change-Id: I64f527f57be72e60a85a53d7ae59d3b0b33c98c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2119293
Commit-Queue: Simon Que <sque@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754772}
parent 4a7fe529
...@@ -992,7 +992,6 @@ ci.fyi_coverage_builder( ...@@ -992,7 +992,6 @@ ci.fyi_coverage_builder(
name = 'ios-simulator-code-coverage', name = 'ios-simulator-code-coverage',
caches = [xcode_cache.x11c29], caches = [xcode_cache.x11c29],
cores = None, cores = None,
goma_backend = None, # TODO(crbug.com/950413): Use goma.backend.RBE_PROD
os = os.MAC_ANY, os = os.MAC_ANY,
use_clang_coverage = True, use_clang_coverage = True,
properties = { properties = {
......
...@@ -549,7 +549,6 @@ try_.chromium_mac_ios_builder( ...@@ -549,7 +549,6 @@ try_.chromium_mac_ios_builder(
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = 'ios-simulator-code-coverage', name = 'ios-simulator-code-coverage',
executable = 'recipe:chromium_trybot', executable = 'recipe:chromium_trybot',
goma_backend = None, # TODO(crbug.com/950413): Use goma.backend.RBE_PROD
use_clang_coverage = True, use_clang_coverage = True,
properties = { properties = {
'coverage_test_types': ['unit'], 'coverage_test_types': ['unit'],
......
...@@ -1204,5 +1204,10 @@ luci.console_view( ...@@ -1204,5 +1204,10 @@ luci.console_view(
category = 'ios|week1c|ios13', category = 'ios|week1c|ios13',
short_name = 'dev', short_name = 'dev',
), ),
luci.console_view_entry(
builder = 'ci/ios-simulator-code-coverage',
category = 'ios|week1d',
short_name = 'code',
),
], ],
) )
...@@ -6925,6 +6925,7 @@ buckets: < ...@@ -6925,6 +6925,7 @@ buckets: <
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}" properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "coverage_test_types:[\"overall\",\"unit\"]" properties_j: "coverage_test_types:[\"overall\",\"unit\"]"
properties_j: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
...@@ -15570,6 +15571,7 @@ buckets: < ...@@ -15570,6 +15571,7 @@ buckets: <
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}" properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "coverage_test_types:[\"unit\"]" properties_j: "coverage_test_types:[\"unit\"]"
properties_j: "mastername:\"tryserver.chromium.mac\"" properties_j: "mastername:\"tryserver.chromium.mac\""
......
...@@ -5555,6 +5555,11 @@ consoles: < ...@@ -5555,6 +5555,11 @@ consoles: <
category: "ios|week1c|ios13" category: "ios|week1c|ios13"
short_name: "dev" short_name: "dev"
> >
builders: <
name: "buildbucket/luci.chromium.ci/ios-simulator-code-coverage"
category: "ios|week1d"
short_name: "code"
>
header: < header: <
oncalls: < oncalls: <
name: "Chromium" name: "Chromium"
......
...@@ -171,14 +171,12 @@ def fyi_coverage_builder( ...@@ -171,14 +171,12 @@ def fyi_coverage_builder(
cores=32, cores=32,
ssd=True, ssd=True,
execution_timeout=20 * time.hour, execution_timeout=20 * time.hour,
goma_backend=builders.goma.backend.RBE_PROD,
**kwargs): **kwargs):
return fyi_builder( return fyi_builder(
name = name, name = name,
cores = cores, cores = cores,
ssd=ssd, ssd=ssd,
execution_timeout = execution_timeout, execution_timeout = execution_timeout,
goma_backend = goma_backend,
**kwargs **kwargs
) )
......
...@@ -1493,7 +1493,7 @@ ...@@ -1493,7 +1493,7 @@
], ],
'clang_code_coverage_ios': [ 'clang_code_coverage_ios': [
'use_clang_coverage', 'debug_static_bot', 'x64', 'ios' 'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_use_goma_rbe',
], ],
'clang_tot_asan_lsan_static_release': [ 'clang_tot_asan_lsan_static_release': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment