aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2016-11-09 18:35:15 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-10 01:00:02 +0000
commit1f2f64b4ce586348cf951b09894b858d1cea8836 (patch)
tree0127f0b88958dc665e0ec235df5d098f4b41e16d
parent03c9f566d86ca69a85256290a5fc8c52cfff6f99 (diff)
[nobuildbot] Copy timeouts from swarm_trigger
BUG=skia: TBR=benjaminwagner GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4642 Change-Id: Ia81609af8ae11c0171c99c459e8711fa786c1e20 Reviewed-on: https://skia-review.googlesource.com/4642 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat
-rw-r--r--infra/bots/gen_tasks.go26
-rw-r--r--infra/bots/tasks.json42
2 files changed, 58 insertions, 10 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index fe69f35312..08978ef60b 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -374,9 +374,11 @@ func doUpload(name string) bool {
// generated chain of tasks, which the Job should add as a dependency.
func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compileTaskName string, pkgs []*specs.CipdPackage) string {
s := &specs.TaskSpec{
- CipdPackages: pkgs,
- Dependencies: []string{compileTaskName},
- Dimensions: swarmDimensions(parts),
+ CipdPackages: pkgs,
+ Dependencies: []string{compileTaskName},
+ Dimensions: swarmDimensions(parts),
+ ExecutionTimeout: 4 * time.Hour,
+ Expiration: 20 * time.Hour,
ExtraArgs: []string{
"--workdir", "../../..", "swarm_test",
fmt.Sprintf("repository=%s", specs.PLACEHOLDER_REPO),
@@ -391,8 +393,9 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE),
fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET),
},
- Isolate: "test_skia.isolate",
- Priority: 0.8,
+ IoTimeout: 40 * time.Minute,
+ Isolate: "test_skia.isolate",
+ Priority: 0.8,
}
if strings.Contains(parts["extra_config"], "Valgrind") {
s.ExecutionTimeout = 9 * time.Hour
@@ -435,9 +438,11 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
// generated chain of tasks, which the Job should add as a dependency.
func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compileTaskName string, pkgs []*specs.CipdPackage) string {
s := &specs.TaskSpec{
- CipdPackages: pkgs,
- Dependencies: []string{compileTaskName},
- Dimensions: swarmDimensions(parts),
+ CipdPackages: pkgs,
+ Dependencies: []string{compileTaskName},
+ Dimensions: swarmDimensions(parts),
+ ExecutionTimeout: 4 * time.Hour,
+ Expiration: 20 * time.Hour,
ExtraArgs: []string{
"--workdir", "../../..", "swarm_perf",
fmt.Sprintf("repository=%s", specs.PLACEHOLDER_REPO),
@@ -452,8 +457,9 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE),
fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET),
},
- Isolate: "perf_skia.isolate",
- Priority: 0.8,
+ IoTimeout: 40 * time.Minute,
+ Isolate: "perf_skia.isolate",
+ Priority: 0.8,
}
if strings.Contains(parts["extra_config"], "Valgrind") {
s.ExecutionTimeout = 9 * time.Hour
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f8d9db0177..7c45853618 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -383,6 +383,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -399,6 +401,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -429,6 +432,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -445,6 +450,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -475,6 +481,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -491,6 +499,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -521,6 +530,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -537,6 +548,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -567,6 +579,8 @@
"os:Ubuntu",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -583,6 +597,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -612,6 +627,8 @@
"os:iOS-9.3.1",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -628,6 +645,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -657,6 +675,8 @@
"os:iOS-9.3.1",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -673,6 +693,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
@@ -703,6 +724,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -719,6 +742,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -749,6 +773,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -765,6 +791,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -795,6 +822,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -811,6 +840,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -841,6 +871,8 @@
"os:Android",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -857,6 +889,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -887,6 +920,8 @@
"os:Ubuntu",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -903,6 +938,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -932,6 +968,8 @@
"os:iOS-9.3.1",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -948,6 +986,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
@@ -977,6 +1016,8 @@
"os:iOS-9.3.1",
"pool:Skia"
],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
@@ -993,6 +1034,7 @@
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
+ "io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 02:45:25 +0000