From 5083f5f3d2e2f3bc08cdf903666b649c8218ce8c Mon Sep 17 00:00:00 2001
From: Ben Wagner <benjaminwagner@google.com>
Date: Thu, 21 Jun 2018 13:52:33 -0400
Subject: Revert "[infra] Enable retries for Windows compiles"

This reverts commit c2a887031691c675cc519347258019f45ceb555c.

Reason for revert: Issue causing flakiness has been resolved.

Original change's description:
> [infra] Enable retries for Windows compiles
>
> They're flaky due to https://github.com/golang/go/issues/21376
>
> Bug: skia:
> Change-Id: Ic629c84b72c492b35d393328aa2178762ce3c7d8
> Reviewed-on: https://skia-review.googlesource.com/123932
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>

TBR=borenet@google.com,mtklein@google.com,rmistry@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: Ieaae0be9796e61ca8f4265198687e847afa853aa
Reviewed-on: https://skia-review.googlesource.com/136633
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
---
 infra/bots/gen_tasks.go |  3 ---
 infra/bots/tasks.json   | 36 ++++++++++++++++++------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'infra/bots')

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 14dcdbe55c..1963b20e18 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -814,9 +814,6 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
 	}
 
 	task.MaxAttempts = 1
-	if strings.Contains(name, "Win") {
-		task.MaxAttempts = 2
-	}
 
 	// Add the task.
 	b.MustAddTask(name, task)
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 8a8145a7f0..3251f3ab71 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -14418,7 +14418,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -14555,7 +14555,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -14692,7 +14692,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -14829,7 +14829,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -14966,7 +14966,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15103,7 +15103,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15240,7 +15240,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15378,7 +15378,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15515,7 +15515,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15652,7 +15652,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15789,7 +15789,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -15927,7 +15927,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16059,7 +16059,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16191,7 +16191,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16323,7 +16323,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16456,7 +16456,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16588,7 +16588,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
@@ -16721,7 +16721,7 @@
       },
       "io_timeout_ns": 3600000000000,
       "isolate": "swarm_recipe.isolate",
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "build"
       ],
-- 
cgit v1.2.3