Reduce timeout threshold for Mac11 tasks
For reasons we don't quite understand, some Perf and Test jobs will
timeout. Normally these tasks are quite quick, so we add a lower timeout
(30 minutes) to keep our limited resources better utilized.
Change-Id: I1f7c4e55e34f8a0f553f10a2be1199799ba8e171
Bug: b/339818100
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/851813
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index f0b49f1..8216a0b 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -1814,6 +1814,8 @@
} else if b.arch("x86") && b.debug() {
// skia:6737
b.timeout(6 * time.Hour)
+ } else if b.matchOs("Mac11") {
+ b.timeout(30 * time.Minute)
}
b.maybeAddIosDevImage()
})
@@ -2022,7 +2024,11 @@
} else if b.parts["arch"] == "x86" && b.parts["configuration"] == "Debug" {
// skia:6737
b.timeout(6 * time.Hour)
- } else if b.extraConfig("LottieWeb", "SkottieWASM") {
+ } else if b.matchOs("Mac11") {
+ b.timeout(30 * time.Minute)
+ }
+
+ if b.extraConfig("LottieWeb", "SkottieWASM") {
b.asset("node", "lottie-samples")
} else if b.matchExtraConfig("SkottieTracing") {
b.needsLottiesWithAssets()
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f115fa4..ddf7f6c 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -34989,12 +34989,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -35076,12 +35076,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -35168,12 +35168,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -35260,12 +35260,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -35347,12 +35347,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -35434,12 +35434,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"perf"
@@ -54783,12 +54783,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -54887,12 +54887,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -54986,12 +54986,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55079,12 +55079,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 1,
"outputs": [
"test"
@@ -55171,12 +55171,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 1,
"outputs": [
"test"
@@ -55269,12 +55269,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55368,12 +55368,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55467,12 +55467,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55566,12 +55566,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55665,12 +55665,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
@@ -55764,12 +55764,12 @@
"cache/vpython3"
]
},
- "execution_timeout_ns": 14400000000000,
+ "execution_timeout_ns": 1800000000000,
"expiration_ns": 72000000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
- "io_timeout_ns": 14400000000000,
+ "io_timeout_ns": 1800000000000,
"max_attempts": 2,
"outputs": [
"test"
