Skip to content
Permalink
Browse files

Reland: infra: Migrate builders to Goma RBE (Week 3c)

Previously this was reverted due to infrastructure issues that have
since been resolved. This CL is the same as the previously landede CL:
https://chromium-review.googlesource.com/c/chromium/src/+/1780983

=============================================

CI/try builders migrated:
- mac-code-coverage-generation
- mac-hermetic-upgrade-rel
- mac-mojo-rel
- mac-osxbeta-rel
- Mac Builder / mac-rel, mac_chromium_10.12_rel_ng, mac_chromium_10.10,
    mac_chromium_compile_rel_ng
- Mac Builder (dbg) / mac_chromium_dbg_ng, mac_chromium_compile_dbg_ng
- GPU Mac Builder / mac-rel

See migration schedule of when this is expected to land:
https://docs.google.com/spreadsheets/d/1TZhpasm6iceYm7zqkyEtZ1wn9ZcpREfH4LV4cusICJA/edit#gid=0

Bug: 950413
Change-Id: I6d19e6043b3d1776321e512a348395c325ed3484
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1860856
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706786}
  • Loading branch information
simonque authored and Commit Bot committed Oct 17, 2019
1 parent 2a257c7 commit dde556412eb9648c25bed4dbb86f6b419a1e9d73
@@ -1184,6 +1184,7 @@ fyi_builder(
# OS shouldn't matter.
fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = goma.backend.RBE_PROD,
)

fyi_builder(
@@ -1247,6 +1248,7 @@ fyi_coverage_builder(
fyi_coverage_builder(
name = 'mac-code-coverage-generation',
cores = 24,
goma_backend = goma.backend.RBE_PROD,
os = None,
use_clang_coverage = True,
)
@@ -1345,10 +1347,12 @@ fyi_mac_builder(
fyi_mac_builder(
name = 'mac-hermetic-upgrade-rel',
cores = 8,
goma_backend = goma.backend.RBE_PROD,
)

fyi_mac_builder(
name = 'mac-mojo-rel',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
)

@@ -1801,6 +1805,7 @@ gpu_builder(
gpu_builder(
name = 'GPU Mac Builder',
cores = None,
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
)

@@ -2000,10 +2005,12 @@ def mac_builder(*, name, cores=None, os=os.MAC_DEFAULT, **kwargs):

mac_builder(
name = 'Mac Builder',
goma_backend = goma.backend.RBE_PROD,
)

mac_builder(
name = 'Mac Builder (dbg)',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
)

@@ -1114,6 +1114,7 @@ mac_builder(

mac_builder(
name = 'mac-rel',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)

@@ -1122,10 +1123,12 @@ mac_builder(
# The 10.xx version translates to which bots will run isolated tests.
mac_builder(
name = 'mac_chromium_10.10',
goma_backend = goma.backend.RBE_PROD,
)

mac_builder(
name = 'mac_chromium_10.12_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)

mac_builder(
@@ -1146,17 +1149,20 @@ mac_builder(
mac_builder(
name = 'mac_chromium_compile_dbg_ng',
builderless = True,
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
os = os.MAC_10_13,
ssd = True,
)

mac_builder(
name = 'mac_chromium_compile_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)

mac_builder(
name = 'mac_chromium_dbg_ng',
goma_backend = goma.backend.RBE_PROD,
)

mac_builder(
@@ -2581,6 +2581,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.gpu\""
>
@@ -4034,6 +4035,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.mac\""
>
@@ -4052,6 +4054,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.mac\""
>
@@ -9062,6 +9065,7 @@ buckets: <
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
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: "mastername:\"chromium.fyi\""
>
@@ -9081,6 +9085,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.fyi\""
>
@@ -9119,6 +9124,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.fyi\""
>
@@ -9139,6 +9145,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"chromium.fyi\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"jobs\":150}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"tryserver.chromium.mac\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"tryserver.chromium.mac\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"tryserver.chromium.mac\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"jobs\":150}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"tryserver.chromium.mac\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"tryserver.chromium.mac\""
>
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
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: "mastername:\"tryserver.chromium.mac\""
>
@@ -3123,6 +3123,45 @@ consoles {
category: "week3b|linux"
short_name: "pie"
}
builders: {
name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
category: "week3c|mac"
short_name: "code"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-hermetic-upgrade-rel"
category: "week3c|mac"
short_name: "herm"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-jumbo-rel"
category: "week3c|mac"
short_name: "jumbo"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
category: "week3c|mac"
short_name: "mojo"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
category: "week3c|mac"
short_name: "osx"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac Builder"
category: "week3c|mac"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
category: "week3c|mac"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
category: "week3c|mac"
short_name: "gpu"
}
builders {
name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
category: "week4|linux"
@@ -3123,6 +3123,45 @@ consoles {
category: "week3b|linux"
short_name: "pie"
}
builders: {
name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
category: "week3c|mac"
short_name: "code"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-hermetic-upgrade-rel"
category: "week3c|mac"
short_name: "herm"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-jumbo-rel"
category: "week3c|mac"
short_name: "jumbo"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
category: "week3c|mac"
short_name: "mojo"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
category: "week3c|mac"
short_name: "osx"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac Builder"
category: "week3c|mac"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
category: "week3c|mac"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
category: "week3c|mac"
short_name: "gpu"
}
builders {
name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
category: "week4|linux"

0 comments on commit dde5564

Please sign in to comment.
You can’t perform that action at this time.