aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2017-06-08 10:34:17 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-08 14:54:19 +0000
commita6b2ba21530463384a80493834b5a8483670f0b3 (patch)
treea6f6a50b52a16814c9e4f819461e13a8699f62ba /infra
parent2d78bcd5577548b71517c8ec4376e17b3d6ca83d (diff)
Increase timeout for 32-bit Debug tests.
Bug: skia:6737 No-Try: true Change-Id: I1e3751f1bce087980bf8f8e4317b1aae1a9fcf8f Reviewed-on: https://skia-review.googlesource.com/19051 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/gen_tasks.go6
-rw-r--r--infra/bots/tasks.json28
2 files changed, 20 insertions, 14 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 07e63ad579..e68101a0d6 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -581,6 +581,9 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
s.CipdPackages = append(s.CipdPackages, b.MustGetCipdPackageFromAsset("valgrind"))
} else if strings.Contains(parts["extra_config"], "MSAN") {
s.ExecutionTimeout = 9 * time.Hour
+ } else if parts["arch"] == "x86" && parts["configuration"] == "Debug" {
+ // skia:6737
+ s.ExecutionTimeout = 6 * time.Hour
}
b.MustAddTask(name, s)
@@ -668,6 +671,9 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
s.CipdPackages = append(s.CipdPackages, b.MustGetCipdPackageFromAsset("valgrind"))
} else if strings.Contains(parts["extra_config"], "MSAN") {
s.ExecutionTimeout = 9 * time.Hour
+ } else if parts["arch"] == "x86" && parts["configuration"] == "Debug" {
+ // skia:6737
+ s.ExecutionTimeout = 6 * time.Hour
}
b.MustAddTask(name, s)
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 5d22648785..eee75a3a1c 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5504,7 +5504,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -5538,7 +5538,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -5572,7 +5572,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -6976,7 +6976,7 @@
"os:Ubuntu-14.04",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -9873,7 +9873,7 @@
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -10065,7 +10065,7 @@
"os:Windows-7-SP1",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -10257,7 +10257,7 @@
"os:Windows-8.1-SP0",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -11585,7 +11585,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -11653,7 +11653,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -11687,7 +11687,7 @@
"os:Android",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -13164,7 +13164,7 @@
"os:Ubuntu-14.04",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -16230,7 +16230,7 @@
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -16518,7 +16518,7 @@
"os:Windows-7-SP1",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
@@ -16806,7 +16806,7 @@
"os:Windows-8.1-SP0",
"pool:Skia"
],
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 21600000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",