diff options
author | Kevin Lubick <kjlubick@google.com> | 2017-12-04 10:20:23 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-04 15:29:28 +0000 |
commit | ea6138253bda6edef21c3a51d47f893c79f29ef8 (patch) | |
tree | fd2ff720e6f1584809e583e33ca6f641ecd3bb82 /infra | |
parent | 4d022b50e1199523c96778301b03734a75eb88a4 (diff) |
Add additional dimension for Valgrind bots
See also: https://chrome-internal-review.googlesource.com/c/infradata/config/+/520679
This should help prevent many many Valgrind bots from
taking all the resources from the rest of the P400 bots
(including the CQ). This is a temporary measure, hopefully
TaskScheduler will be able to do this by itself in the future.
Bug: skia:
NOTRY=true
Change-Id: Ia618f9bd90364c6658e6b08b19c8bf214e5c33d9
Reviewed-on: https://skia-review.googlesource.com/79760
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r-- | infra/bots/gen_tasks.go | 2 | ||||
-rw-r--r-- | infra/bots/tasks.json | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 9b710a8a0e..7d4b086331 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -805,6 +805,7 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil s.Expiration = 48 * time.Hour s.IoTimeout = time.Hour s.CipdPackages = append(s.CipdPackages, b.MustGetCipdPackageFromAsset("valgrind")) + s.Dimensions = append(s.Dimensions, "valgrind:1") } else if strings.Contains(parts["extra_config"], "MSAN") { s.ExecutionTimeout = 9 * time.Hour } else if parts["arch"] == "x86" && parts["configuration"] == "Debug" { @@ -986,6 +987,7 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil s.Expiration = 48 * time.Hour s.IoTimeout = time.Hour s.CipdPackages = append(s.CipdPackages, b.MustGetCipdPackageFromAsset("valgrind")) + s.Dimensions = append(s.Dimensions, "valgrind:1") } else if strings.Contains(parts["extra_config"], "MSAN") { s.ExecutionTimeout = 9 * time.Hour } else if parts["arch"] == "x86" && parts["configuration"] == "Debug" { diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 40bf520cc7..cac3bb48e2 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -10021,7 +10021,8 @@ "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", - "pool:Skia" + "pool:Skia", + "valgrind:1" ], "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, @@ -10073,7 +10074,8 @@ "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", - "pool:Skia" + "pool:Skia", + "valgrind:1" ], "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, @@ -19355,7 +19357,8 @@ "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", - "pool:Skia" + "pool:Skia", + "valgrind:1" ], "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, @@ -19408,7 +19411,8 @@ "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", - "pool:Skia" + "pool:Skia", + "valgrind:1" ], "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, @@ -19461,7 +19465,8 @@ "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", - "pool:Skia" + "pool:Skia", + "valgrind:1" ], "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, |