Commit 2c0f956a authored by Simon Que's avatar Simon Que Committed by Commit Bot

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

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: Id8393aef0b885a3e73bbf68ebffe15d1256e9cc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1780983Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696300}
parent cd609a7f
...@@ -1984,12 +1984,14 @@ buckets { ...@@ -1984,12 +1984,14 @@ buckets {
name: "mac-mojo-rel" name: "mac-mojo-rel"
mixins: "mac" mixins: "mac"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "goma-rbe-prod"
dimensions: "cores:4" dimensions: "cores:4"
} }
builders { builders {
name: "Mac Builder" name: "Mac Builder"
mixins: "mac-ci" mixins: "mac-ci"
mixins: "goma-rbe-prod"
dimensions:"os:Mac-10.13" dimensions:"os:Mac-10.13"
} }
builders { builders {
...@@ -2017,6 +2019,7 @@ buckets { ...@@ -2017,6 +2019,7 @@ buckets {
builders { builders {
name: "Mac Builder (dbg)" name: "Mac Builder (dbg)"
mixins: "mac-ci" mixins: "mac-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Mac10.13 Tests (dbg)" name: "Mac10.13 Tests (dbg)"
...@@ -2030,6 +2033,7 @@ buckets { ...@@ -2030,6 +2033,7 @@ buckets {
builders { builders {
name: "GPU Mac Builder" name: "GPU Mac Builder"
mixins: "mac-gpu-ci" mixins: "mac-gpu-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Mac Release (Intel)" name: "Mac Release (Intel)"
...@@ -2684,6 +2688,7 @@ buckets { ...@@ -2684,6 +2688,7 @@ buckets {
name: "mac-code-coverage-generation" name: "mac-code-coverage-generation"
mixins: "code-coverage" mixins: "code-coverage"
mixins: "clang-coverage" mixins: "clang-coverage"
mixins: "goma-rbe-prod"
dimensions: "cores:24" dimensions: "cores:24"
} }
builders { builders {
...@@ -3137,10 +3142,12 @@ buckets { ...@@ -3137,10 +3142,12 @@ buckets {
name: "mac-hermetic-upgrade-rel" name: "mac-hermetic-upgrade-rel"
dimensions: "os:Mac-10.13" dimensions: "os:Mac-10.13"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "mac-osxbeta-rel" name: "mac-osxbeta-rel"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "goma-rbe-prod"
# This is launching & collecting entirely isolated tests. # This is launching & collecting entirely isolated tests.
# OS shouldn't matter. # OS shouldn't matter.
mixins: "linux-xenial" mixins: "linux-xenial"
...@@ -4759,8 +4766,16 @@ buckets { ...@@ -4759,8 +4766,16 @@ buckets {
# NOTE: the folliwing 3 trybots aren't sensitive to Mac version on which # NOTE: the folliwing 3 trybots aren't sensitive to Mac version on which
# they are built, hence no additional dimension is specified. # they are built, hence no additional dimension is specified.
# The 10.xx version translates to which bots will run isolated tests. # The 10.xx version translates to which bots will run isolated tests.
builders { mixins: "mac-try" name: "mac_chromium_10.10" } builders {
builders { mixins: "mac-try" name: "mac_chromium_10.12_rel_ng" } mixins: "mac-try"
mixins: "goma-rbe-prod"
name: "mac_chromium_10.10"
}
builders {
mixins: "mac-try"
mixins: "goma-rbe-prod"
name: "mac_chromium_10.12_rel_ng"
}
builders { builders {
mixins: "mac-try" mixins: "mac-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
...@@ -4774,17 +4789,25 @@ buckets { ...@@ -4774,17 +4789,25 @@ buckets {
} }
builders { builders {
mixins: "mac-try" mixins: "mac-try"
mixins: "goma-j150" mixins: "goma-rbe-prod-j150"
mixins: "builderless" mixins: "builderless"
name: "mac_chromium_compile_dbg_ng" name: "mac_chromium_compile_dbg_ng"
dimensions:"os:Mac-10.13" dimensions:"os:Mac-10.13"
dimensions:"ssd:1" dimensions:"ssd:1"
} }
builders { mixins: "mac-try" name: "mac_chromium_compile_rel_ng" }
builders { mixins: "mac-try" name: "mac_chromium_dbg_ng" }
builders { builders {
mixins: "mac-try" mixins: "mac-try"
mixins: "goma-j150" mixins: "goma-rbe-prod"
name: "mac_chromium_compile_rel_ng"
}
builders {
mixins: "mac-try"
mixins: "goma-rbe-prod"
name: "mac_chromium_dbg_ng"
}
builders {
mixins: "mac-try"
mixins: "goma-rbe-prod-j150"
name: "mac-rel" name: "mac-rel"
} }
builders { builders {
......
...@@ -3205,6 +3205,45 @@ consoles { ...@@ -3205,6 +3205,45 @@ consoles {
category: "week3b|linux" category: "week3b|linux"
short_name: "pie" 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 { builders {
name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan" name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
category: "week4|linux" category: "week4|linux"
......
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