Commit bc411d09 authored by Simon Que's avatar Simon Que Committed by Commit Bot

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

These are builders that were migrated from json to Chromium recipe
configs, e.g. crrev.com/c/2071293, before Week 1b could be relanded.

This group of builders is to migrate those builders separately:
- ios-simulator-cr-recipe (inactive since Nov 2019)
- ios-simulator-cronet
- ios-webkit-tot
- ios13-sdk-device

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

Bug: 950413
Change-Id: I5bea944d63154048b5b5c951336f9d76befd2e3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2119892Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753454}
parent 07617a2b
...@@ -1027,7 +1027,6 @@ ci.fyi_ios_builder( ...@@ -1027,7 +1027,6 @@ ci.fyi_ios_builder(
ci.fyi_ios_builder( ci.fyi_ios_builder(
name = 'ios13-beta-simulator', name = 'ios13-beta-simulator',
executable = 'recipe:chromium', executable = 'recipe:chromium',
goma_backend = goma.backend.RBE_PROD,
properties = { properties = {
'xcode_build_version': '11c29', 'xcode_build_version': '11c29',
}, },
...@@ -1044,7 +1043,6 @@ ci.fyi_ios_builder( ...@@ -1044,7 +1043,6 @@ ci.fyi_ios_builder(
ci.fyi_ios_builder( ci.fyi_ios_builder(
name = 'ios13-sdk-simulator', name = 'ios13-sdk-simulator',
executable = 'recipe:chromium', executable = 'recipe:chromium',
goma_backend = goma.backend.RBE_PROD,
properties = { properties = {
'xcode_build_version': '11c29' 'xcode_build_version': '11c29'
} }
......
...@@ -1194,5 +1194,25 @@ luci.console_view( ...@@ -1194,5 +1194,25 @@ luci.console_view(
category = 'ios|week1b|m81', category = 'ios|week1b|m81',
short_name = 'sim', short_name = 'sim',
), ),
luci.console_view_entry(
builder = 'ci/ios-simulator-cronet',
category = 'ios|week1c',
short_name = 'cro',
),
luci.console_view_entry(
builder = 'ci/ios-simulator-cr-recipe',
category = 'ios|week1c',
short_name = 'crr',
),
luci.console_view_entry(
builder = 'ci/ios-webkit-tot',
category = 'ios|week1c',
short_name = 'webkit',
),
luci.console_view_entry(
builder = 'ci/ios13-sdk-device',
category = 'ios|week1c|ios13',
short_name = 'dev',
),
], ],
) )
...@@ -6924,6 +6924,7 @@ buckets: < ...@@ -6924,6 +6924,7 @@ buckets: <
name: "chromium" name: "chromium"
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/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: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11a1027\"" properties_j: "xcode_build_version:\"11a1027\""
...@@ -6947,6 +6948,7 @@ buckets: < ...@@ -6947,6 +6948,7 @@ buckets: <
name: "chromium" name: "chromium"
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/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: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11c29\"" properties_j: "xcode_build_version:\"11c29\""
...@@ -7018,6 +7020,7 @@ buckets: < ...@@ -7018,6 +7020,7 @@ buckets: <
name: "chromium" name: "chromium"
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/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: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11c505wk\"" properties_j: "xcode_build_version:\"11c505wk\""
...@@ -7065,6 +7068,7 @@ buckets: < ...@@ -7065,6 +7068,7 @@ buckets: <
name: "chromium" name: "chromium"
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/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: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11c29\"" properties_j: "xcode_build_version:\"11c29\""
......
...@@ -5525,6 +5525,26 @@ consoles: < ...@@ -5525,6 +5525,26 @@ consoles: <
category: "ios|week1b|m81" category: "ios|week1b|m81"
short_name: "sim" short_name: "sim"
> >
builders: <
name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
category: "ios|week1c"
short_name: "cro"
>
builders: <
name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
category: "ios|week1c"
short_name: "crr"
>
builders: <
name: "buildbucket/luci.chromium.ci/ios-webkit-tot"
category: "ios|week1c"
short_name: "webkit"
>
builders: <
name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
category: "ios|week1c|ios13"
short_name: "dev"
>
header: < header: <
oncalls: < oncalls: <
name: "Chromium" name: "Chromium"
......
...@@ -200,7 +200,7 @@ def fyi_ios_builder( ...@@ -200,7 +200,7 @@ def fyi_ios_builder(
name, name,
caches = None, caches = None,
executable='recipe:ios/unified_builder_tester', executable='recipe:ios/unified_builder_tester',
goma_backend = None, goma_backend=builders.goma.backend.RBE_PROD,
**kwargs): **kwargs):
if not caches: if not caches:
...@@ -211,7 +211,6 @@ def fyi_ios_builder( ...@@ -211,7 +211,6 @@ def fyi_ios_builder(
caches = caches, caches = caches,
cores = None, cores = None,
executable = executable, executable = executable,
goma_backend = goma_backend,
os = builders.os.MAC_ANY, os = builders.os.MAC_ANY,
**kwargs **kwargs
) )
......
...@@ -2457,7 +2457,7 @@ ...@@ -2457,7 +2457,7 @@
}, },
'ios_device': { 'ios_device': {
'mixins': ['ios'], 'mixins': ['ios', 'ios_use_goma_rbe' ],
'gn_args': 'target_cpu="arm64"', 'gn_args': 'target_cpu="arm64"',
}, },
......
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