AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Add rack dimension for QuadroP400 tasks.

Browse Source 
See https://bugs.chromium.org/p/chromium/issues/detail?id=784662 for
more context. We need to distinguish between existing bots and the new
bots in order to have consistent performance measurements.

This is step 2 of 3:
1. Add rack:1 dimension to bots.cfg for current Skia QuadroP400 bots.
2. Add rack:1 dimension to our tasks to ensure they only run on the
   current bots.
3. Add build{330..335}-a9 to bots.cfg with rack:2 dimension.

Bug: chromium:784662
Change-Id: I1e5ff0aa0ebd69e00f4933ca50eef6cef520bc66
Reviewed-on: https://skia-review.googlesource.com/150911
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Ben Wagner 2018-08-31 12:56:31 -04:00 committed by Skia Commit-Bot
parent 0473a3108b
commit d709a85751
2 changed files with 121 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
infra/bots/gen_tasks.go
View File

@ -314,7 +314,7 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri
Dependencies: []string{BUNDLE_RECIPES_NAME},
Dimensions: dimensions,
EnvPrefixes: map[string][]string{
"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
"VPYTHON_VIRTUALENV_ROOT": []string{"cache/vpython"},
},
ExtraTags: map[string]string{
@ -553,16 +553,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
glog.Fatalf("Entry %q not found in Win GPU mapping.", parts["cpu_or_gpu_value"])
}
d["gpu"] = gpu
// Specify cpu dimension for NUCs and ShuttleCs. We temporarily have two
// types of machines with a GTX960.
cpu, ok := map[string]string{
"NUC6i7KYK": "x86-64-i7-6770HQ",
"ShuttleC": "x86-64-i7-6700K",
}[parts["model"]]
if ok {
d["cpu"] = cpu
}
} else if strings.Contains(parts["os"], "Ubuntu") || strings.Contains(parts["os"], "Debian") {
gpu, ok := map[string]string{
// Intel drivers come from CIPD, so no need to specify the version here.
@ -634,6 +624,13 @@ func defaultSwarmDimensions(parts map[string]string) []string {
}
}
if parts["cpu_or_gpu_value"] == "QuadroP400" {
// Specify "rack" dimension for consistent test results.
// See https://bugs.chromium.org/p/chromium/issues/detail?id=784662&desc=2#c34
// for more context.
d["rack"] = "1"
}
rv := make([]string, 0, len(d))
for k, v := range d {
rv = append(rv, fmt.Sprintf("%s:%s", k, v))

179
infra/bots/tasks.json
View File

@ -17425,7 +17425,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -30465,7 +30466,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -30581,7 +30583,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -30697,7 +30700,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -30808,7 +30812,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -30924,7 +30929,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -31040,7 +31046,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -31157,6 +31164,7 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -31274,6 +31282,7 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -32550,7 +32559,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -32666,7 +32676,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -32782,7 +32793,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -32898,7 +32910,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -33014,7 +33027,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -33130,7 +33144,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -33232,7 +33247,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -33334,7 +33350,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -33436,7 +33453,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -37262,7 +37280,6 @@
"Build-Win-Clang-x86_64-Debug"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -37379,7 +37396,6 @@
"Build-Win-Clang-x86_64-Debug-ANGLE"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -37496,7 +37512,6 @@
"Build-Win-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -37613,7 +37628,6 @@
"Build-Win-Clang-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -37730,7 +37744,6 @@
"Build-Win-Clang-x86_64-Release-ANGLE"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -37847,7 +37860,6 @@
"Build-Win-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -38662,7 +38674,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -38778,7 +38791,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -38894,7 +38908,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -39010,7 +39025,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -57828,7 +57844,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -57944,7 +57961,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58055,7 +58073,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58171,7 +58190,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58282,7 +58302,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58398,7 +58419,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58519,7 +58541,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58635,7 +58658,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58751,7 +58775,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58862,7 +58887,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -58978,7 +59004,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59089,7 +59116,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59205,7 +59233,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59321,7 +59350,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59442,7 +59472,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59558,7 +59589,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59679,7 +59711,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59790,7 +59823,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -59906,7 +59940,8 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -60023,6 +60058,7 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -60140,6 +60176,7 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -60257,6 +60294,7 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -61533,7 +61571,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -61649,7 +61688,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -61765,7 +61805,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -61881,7 +61922,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62002,7 +62044,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62118,7 +62161,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62234,7 +62278,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62350,7 +62395,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62466,7 +62512,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62582,7 +62629,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -62703,7 +62751,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -66877,7 +66926,6 @@
"Build-Win-Clang-x86_64-Debug"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -66994,7 +67042,6 @@
"Build-Win-Clang-x86_64-Debug-ANGLE"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -67111,7 +67158,6 @@
"Build-Win-Clang-x86_64-Debug-Vulkan"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -67228,7 +67274,6 @@
"Build-Win-Clang-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -67345,7 +67390,6 @@
"Build-Win-Clang-x86_64-Release-ANGLE"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -67462,7 +67506,6 @@
"Build-Win-Clang-x86_64-Release-Vulkan"
],
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-24.21.13.9882",
"os:Windows-10-17134.191",
"pool:Skia"
@ -68277,7 +68320,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -68393,7 +68437,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -68509,7 +68554,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [
@ -68625,7 +68671,8 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia"
"pool:Skia",
"rack:1"
],
"env_prefixes": {
"PATH": [