infra: Migrate builders to Goma RBE

Bug: 950413
Change-Id: I95ff4bc6380eb2af210a8c264411d6064a9a8b32
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/22900
Reviewed-by: Simon Que <sque@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2020-06-09 12:34:02 +00:00 committed by Commit Bot service account
parent 0a79bee135
commit 83faf15d21
1 changed files with 54 additions and 18 deletions

View File

@ -70,6 +70,32 @@ builder_mixins {
properties: "target_cpu:x64" properties: "target_cpu:x64"
} }
} }
builder_mixins {
name: "linux",
dimensions: "os:Ubuntu-16.04"
recipe {
properties_j: <<EOF
$build/goma: {
"enable_ats": true,
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org"
}
EOF
}
}
builder_mixins {
name: "windows",
dimensions: "os:Windows"
recipe {
properties_j: <<EOF
$build/goma: {
"enable_ats": true,
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org"
}
EOF
}
}
builder_mixins { builder_mixins {
name: "mac" name: "mac"
dimensions: "os:Mac-10.15" dimensions: "os:Mac-10.15"
@ -79,10 +105,16 @@ builder_mixins {
} }
recipe { recipe {
properties_j: <<EOF properties_j: <<EOF
$depot_tools/osx_sdk:{ $depot_tools/osx_sdk: {
"sdk_version": "11b52" "sdk_version": "11b52"
} }
EOF EOF
properties_j: <<EOF
$build/goma: {
"rpc_extra_params": "?prod",
"server_host": "goma.chromium.org"
}
EOF
} }
} }
@ -111,25 +143,25 @@ buckets {
# Linux: test combinations of {clang}x{release,debug}x{x86,x64} # Linux: test combinations of {clang}x{release,debug}x{x86,x64}
builders { builders {
name: "linux-clang-dbg-x64" name: "linux-clang-dbg-x64"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "debug" mixins: "debug"
mixins: "x64" mixins: "x64"
} }
builders { builders {
name: "linux-clang-dbg-x86" name: "linux-clang-dbg-x86"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "debug" mixins: "debug"
mixins: "x86" mixins: "x86"
} }
builders { builders {
name: "linux-clang-rel-x64" name: "linux-clang-rel-x64"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "release" mixins: "release"
mixins: "x64" mixins: "x64"
} }
builders { builders {
name: "linux-clang-rel-x86" name: "linux-clang-rel-x86"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "release" mixins: "release"
mixins: "x86" mixins: "x86"
} }
@ -146,36 +178,38 @@ buckets {
mixins: "release" mixins: "release"
} }
# Linux: test combinations of {clang,msvc}x{release,debug}x{x86,x64} # Windows: test combinations of {clang,msvc}x{release,debug}x{x86,x64}
# but limit msvc to x64 # but limit msvc to x64
builders { builders {
name: "win-clang-dbg-x64" name: "win-clang-dbg-x64"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "debug" mixins: "debug"
mixins: "x64" mixins: "x64"
} }
builders { builders {
name: "win-clang-dbg-x86" name: "win-clang-dbg-x86"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "debug" mixins: "debug"
mixins: "x86" mixins: "x86"
} }
builders { builders {
name: "win-clang-rel-x64" name: "win-clang-rel-x64"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "release" mixins: "release"
mixins: "x64" mixins: "x64"
} }
builders { builders {
name: "win-clang-rel-x86" name: "win-clang-rel-x86"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "release" mixins: "release"
mixins: "x86" mixins: "x86"
} }
# GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
# instead list the dimensions: "os:Windows" directly.
builders { builders {
name: "win-msvc-dbg-x64" name: "win-msvc-dbg-x64"
dimensions: "os:Windows" dimensions: "os:Windows"
@ -234,28 +268,28 @@ buckets: {
# CI Mirror only # CI Mirror only
builders { builders {
name: "linux-clang-dbg-x64" name: "linux-clang-dbg-x64"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "debug" mixins: "debug"
mixins: "x64" mixins: "x64"
} }
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "linux-clang-dbg-x86" name: "linux-clang-dbg-x86"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "debug" mixins: "debug"
mixins: "x86" mixins: "x86"
} }
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "linux-clang-rel-x64" name: "linux-clang-rel-x64"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "release" mixins: "release"
mixins: "x64" mixins: "x64"
} }
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "linux-clang-rel-x86" name: "linux-clang-rel-x86"
dimensions: "os:Ubuntu-16.04" mixins: "linux"
mixins: "release" mixins: "release"
mixins: "x86" mixins: "x86"
} }
@ -276,7 +310,7 @@ buckets: {
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "win-clang-dbg-x64" name: "win-clang-dbg-x64"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "debug" mixins: "debug"
mixins: "x64" mixins: "x64"
@ -284,7 +318,7 @@ buckets: {
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "win-clang-dbg-x86" name: "win-clang-dbg-x86"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "debug" mixins: "debug"
mixins: "x86" mixins: "x86"
@ -292,7 +326,7 @@ buckets: {
# Actually on the CQ # Actually on the CQ
builders { builders {
name: "win-clang-rel-x64" name: "win-clang-rel-x64"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "release" mixins: "release"
mixins: "x64" mixins: "x64"
@ -300,11 +334,13 @@ buckets: {
# CI Mirror only # CI Mirror only
builders { builders {
name: "win-clang-rel-x86" name: "win-clang-rel-x86"
dimensions: "os:Windows" mixins: "windows"
mixins: "clang" mixins: "clang"
mixins: "release" mixins: "release"
mixins: "x86" mixins: "x86"
} }
# GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
# instead list the dimensions: "os:Windows" directly.
# CI Mirror only # CI Mirror only
builders { builders {
name: "win-msvc-dbg-x64" name: "win-msvc-dbg-x64"