[infra] Enable QuadroP400 bots on rack:2

I tried to determine the differences between rack:1 and rack:2 using
trybots, but didn't have much luck. Hopefully whatever issue that was
causing differences has gone away, but if not, hopefully it will be
easier to identify the differences using Perf.

Change-Id: If9b16e8e247737cfc61bf00629eb68b8751bbf3a
Reviewed-on: https://skia-review.googlesource.com/156500
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-09-24 14:56:51 -04:00 committed by Skia Commit-Bot
parent 15052410fd
commit 297caafc58
2 changed files with 53 additions and 117 deletions

View File

@ -311,7 +311,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{
@ -614,13 +614,6 @@ 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))

View File

@ -17022,8 +17022,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30063,8 +30062,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30180,8 +30178,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30297,8 +30294,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30409,8 +30405,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30526,8 +30521,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30643,8 +30637,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -30761,7 +30754,6 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -30879,7 +30871,6 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -32156,8 +32147,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32273,8 +32263,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32390,8 +32379,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32507,8 +32495,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32624,8 +32611,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32741,8 +32727,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32844,8 +32829,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -32947,8 +32931,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -33050,8 +33033,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -36879,8 +36861,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -36996,8 +36977,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -37113,8 +37093,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -37230,8 +37209,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -54817,8 +54795,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -54934,8 +54911,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55046,8 +55022,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55163,8 +55138,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55275,8 +55249,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55392,8 +55365,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55514,8 +55486,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55631,8 +55602,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55748,8 +55718,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55860,8 +55829,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -55977,8 +55945,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56094,8 +56061,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56216,8 +56182,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56333,8 +56298,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56455,8 +56419,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56567,8 +56530,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56684,8 +56646,7 @@
"dimensions": [
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -56802,7 +56763,6 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -56920,7 +56880,6 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -57038,7 +56997,6 @@
"gpu:10de:1cb3-384.59",
"os:Ubuntu-17.04",
"pool:Skia",
"rack:1",
"valgrind:1"
],
"env_prefixes": {
@ -58315,8 +58273,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -58432,8 +58389,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -58549,8 +58505,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -58666,8 +58621,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -58788,8 +58742,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -58905,8 +58858,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -59022,8 +58974,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -59139,8 +59090,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -59256,8 +59206,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -59373,8 +59322,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -59495,8 +59443,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -63672,8 +63619,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -63789,8 +63735,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -63906,8 +63851,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [
@ -64023,8 +63967,7 @@
"dimensions": [
"gpu:10de:1cb3-23.21.13.9103",
"os:Windows-10-16299.309",
"pool:Skia",
"rack:1"
"pool:Skia"
],
"env_prefixes": {
"PATH": [