1 files changed, 26 insertions, 9 deletions
diff --git a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json
index 8bcfefec5e..a5ba6b1b7b 100644
--- a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json
+++ b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json
@@ -43,12 +43,9 @@
     ],
     "cwd": "[CUSTOM_/_B_WORK]",
     "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
       "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
       "GIT_HTTP_LOW_SPEED_TIME": "300",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[START_DIR]/out"
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "bot_update",
@@ -88,7 +85,11 @@
       "go.skia.org/infra/..."
     ],
     "env": {
-      "GOPATH": "[CUSTOM_/_B_WORK]/gopath"
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[CUSTOM_/_B_WORK]/gopath",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "update go pkgs",
     "~followup_annotations": [
@@ -105,7 +106,11 @@
       "go.skia.org/infra/..."
     ],
     "env": {
-      "GOPATH": "[CUSTOM_/_B_WORK]/gopath"
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[CUSTOM_/_B_WORK]/gopath",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "update go pkgs (attempt 2)",
     "~followup_annotations": [
@@ -122,7 +127,11 @@
       "go.skia.org/infra/..."
     ],
     "env": {
-      "GOPATH": "[CUSTOM_/_B_WORK]/gopath"
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[CUSTOM_/_B_WORK]/gopath",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "update go pkgs (attempt 3)",
     "~followup_annotations": [
@@ -139,7 +148,11 @@
       "go.skia.org/infra/..."
     ],
     "env": {
-      "GOPATH": "[CUSTOM_/_B_WORK]/gopath"
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[CUSTOM_/_B_WORK]/gopath",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "update go pkgs (attempt 4)",
     "~followup_annotations": [
@@ -156,7 +169,11 @@
       "go.skia.org/infra/..."
     ],
     "env": {
-      "GOPATH": "[CUSTOM_/_B_WORK]/gopath"
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[CUSTOM_/_B_WORK]/gopath",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "update go pkgs (attempt 5)",
     "~followup_annotations": [