Roll Recipe DEPS

Yet more upstream breaks

BUG=skia:

Change-Id: I2f38af7da8a1d5c3de61c5d0f52621ce64292e81
Reviewed-on: https://skia-review.googlesource.com/8983
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

15 files changed, 220 insertions, 340 deletions

diff --git a/infra/bots/recipe_modules/ct/__init__.py b/infra/bots/recipe_modules/ct/__init__.py
index e846db47da..f9d542c303 100644
--- a/infra/bots/recipe_modules/ct/__init__.py
+++ b/infra/bots/recipe_modules/ct/__init__.py
@@ -4,7 +4,7 @@
 
 DEPS = [
   'build/file',
-  'build/gsutil',
+  'depot_tools/gsutil',
   'recipe_engine/path',
   'recipe_engine/step',
   'run',
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
index 8b84d9c30a..433c67637c 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-1",
+      "stepname:ct-nanobench-1 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-1]"
     ],
-    "name": "[trigger] ct-nanobench-1",
+    "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-2",
+      "stepname:ct-nanobench-2 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-2]"
     ],
-    "name": "[trigger] ct-nanobench-2",
+    "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-3",
+      "stepname:ct-nanobench-3 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-3]"
     ],
-    "name": "[trigger] ct-nanobench-3",
+    "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-4",
+      "stepname:ct-nanobench-4 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-4]"
     ],
-    "name": "[trigger] ct-nanobench-4",
+    "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-5",
+      "stepname:ct-nanobench-5 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-5]"
     ],
-    "name": "[trigger] ct-nanobench-5",
+    "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
     ],
-    "name": "ct-nanobench-1",
+    "name": "ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1369,7 +1359,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1391,7 +1381,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1426,7 +1416,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
     ],
-    "name": "ct-nanobench-2",
+    "name": "ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1498,7 +1488,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1520,7 +1510,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1555,7 +1545,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
     ],
-    "name": "ct-nanobench-3",
+    "name": "ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1627,7 +1617,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1649,7 +1639,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1684,7 +1674,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
     ],
-    "name": "ct-nanobench-4",
+    "name": "ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1756,7 +1746,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1778,7 +1768,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1813,7 +1803,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
     ],
-    "name": "ct-nanobench-5",
+    "name": "ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1885,7 +1875,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1907,7 +1897,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
index 4115c2b5da..5ad36181de 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
index 4b90110e3d..cd606686e0 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
index fc3baddd11..ae48f527f5 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@@ -975,12 +975,10 @@
       "--tag",
       "rietveld:codereview.chromium.org/1499623002/#ps1",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1047,12 +1045,10 @@
       "--tag",
       "rietveld:codereview.chromium.org/1499623002/#ps1",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1119,12 +1115,10 @@
       "--tag",
       "rietveld:codereview.chromium.org/1499623002/#ps1",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1191,12 +1185,10 @@
       "--tag",
       "rietveld:codereview.chromium.org/1499623002/#ps1",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1263,12 +1255,10 @@
       "--tag",
       "rietveld:codereview.chromium.org/1499623002/#ps1",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1303,7 +1293,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1365,7 +1355,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1417,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1489,7 +1479,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1551,7 +1541,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
index c146d1160b..d405887736 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
index 060d76319a..0f9c9c1e38 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1363,7 +1353,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1425,7 +1415,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1491,7 +1481,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1553,7 +1543,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1600,7 +1590,7 @@
   },
   {
     "name": "$result",
-    "reason": "Failed steps: ct-dm-1, ct-dm-3",
+    "reason": "Failed steps: ct-dm-1 on Ubuntu-14.04, ct-dm-3 on Ubuntu-14.04",
     "recipe_result": null,
     "status_code": 1
   }
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
index 96714969c4..f55172d34b 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-1",
+      "stepname:ct-dm-1 on Ubuntu-14.04",
       "[dummy hash for ct-dm-1]"
     ],
-    "name": "[trigger] ct-dm-1",
+    "name": "[trigger] ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-2",
+      "stepname:ct-dm-2 on Ubuntu-14.04",
       "[dummy hash for ct-dm-2]"
     ],
-    "name": "[trigger] ct-dm-2",
+    "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-3",
+      "stepname:ct-dm-3 on Ubuntu-14.04",
       "[dummy hash for ct-dm-3]"
     ],
-    "name": "[trigger] ct-dm-3",
+    "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-4",
+      "stepname:ct-dm-4 on Ubuntu-14.04",
       "[dummy hash for ct-dm-4]"
     ],
-    "name": "[trigger] ct-dm-4",
+    "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-dm-5",
+      "stepname:ct-dm-5 on Ubuntu-14.04",
       "[dummy hash for ct-dm-5]"
     ],
-    "name": "[trigger] ct-dm-5",
+    "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1"
     ],
-    "name": "ct-dm-1",
+    "name": "ct-dm-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2"
     ],
-    "name": "ct-dm-2",
+    "name": "ct-dm-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3"
     ],
-    "name": "ct-dm-3",
+    "name": "ct-dm-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
@@ -1487,7 +1477,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4"
     ],
-    "name": "ct-dm-4",
+    "name": "ct-dm-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1549,7 +1539,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5"
     ],
-    "name": "ct-dm-5",
+    "name": "ct-dm-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1596,7 +1586,7 @@
   },
   {
     "name": "$result",
-    "reason": "Failed steps: ct-dm-3",
+    "reason": "Failed steps: ct-dm-3 on Ubuntu-14.04",
     "recipe_result": null,
     "status_code": 1
   }
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
index 6d44f77dbd..985f48aa51 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@@ -972,12 +972,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-1",
+      "stepname:ct-nanobench-1 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-1]"
     ],
-    "name": "[trigger] ct-nanobench-1",
+    "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1047,12 +1045,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-2",
+      "stepname:ct-nanobench-2 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-2]"
     ],
-    "name": "[trigger] ct-nanobench-2",
+    "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1122,12 +1118,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-3",
+      "stepname:ct-nanobench-3 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-3]"
     ],
-    "name": "[trigger] ct-nanobench-3",
+    "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1197,12 +1191,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-4",
+      "stepname:ct-nanobench-4 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-4]"
     ],
-    "name": "[trigger] ct-nanobench-4",
+    "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1272,12 +1264,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-5",
+      "stepname:ct-nanobench-5 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-5]"
     ],
-    "name": "[trigger] ct-nanobench-5",
+    "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1312,7 +1302,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
     ],
-    "name": "ct-nanobench-1",
+    "name": "ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1384,7 +1374,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1406,7 +1396,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1441,7 +1431,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
     ],
-    "name": "ct-nanobench-2",
+    "name": "ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1513,7 +1503,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1535,7 +1525,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1570,7 +1560,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
     ],
-    "name": "ct-nanobench-3",
+    "name": "ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1642,7 +1632,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1664,7 +1654,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1699,7 +1689,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
     ],
-    "name": "ct-nanobench-4",
+    "name": "ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1771,7 +1761,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1793,7 +1783,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1828,7 +1818,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
     ],
-    "name": "ct-nanobench-5",
+    "name": "ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1900,7 +1890,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1922,7 +1912,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
index b4dd0cb7d4..40fcecb5b3 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@@ -972,12 +972,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-1",
+      "stepname:ct-nanobench-1 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-1]"
     ],
-    "name": "[trigger] ct-nanobench-1",
+    "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1047,12 +1045,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-2",
+      "stepname:ct-nanobench-2 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-2]"
     ],
-    "name": "[trigger] ct-nanobench-2",
+    "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1122,12 +1118,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-3",
+      "stepname:ct-nanobench-3 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-3]"
     ],
-    "name": "[trigger] ct-nanobench-3",
+    "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1197,12 +1191,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-4",
+      "stepname:ct-nanobench-4 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-4]"
     ],
-    "name": "[trigger] ct-nanobench-4",
+    "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1272,12 +1264,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-nanobench-5",
+      "stepname:ct-nanobench-5 on Ubuntu-14.04",
       "[dummy hash for ct-nanobench-5]"
     ],
-    "name": "[trigger] ct-nanobench-5",
+    "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1312,7 +1302,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1"
     ],
-    "name": "ct-nanobench-1",
+    "name": "ct-nanobench-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1384,7 +1374,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1406,7 +1396,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1441,7 +1431,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2"
     ],
-    "name": "ct-nanobench-2",
+    "name": "ct-nanobench-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1513,7 +1503,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1535,7 +1525,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1570,7 +1560,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3"
     ],
-    "name": "ct-nanobench-3",
+    "name": "ct-nanobench-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1642,7 +1632,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1664,7 +1654,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1699,7 +1689,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4"
     ],
-    "name": "ct-nanobench-4",
+    "name": "ct-nanobench-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1771,7 +1761,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1793,7 +1783,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1828,7 +1818,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5"
     ],
-    "name": "ct-nanobench-5",
+    "name": "ct-nanobench-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1900,7 +1890,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
@@ -1922,7 +1912,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
index c62613d009..e117dfd3cd 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-1",
+      "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-1]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-1",
+    "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-2",
+      "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-2]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-2",
+    "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-3",
+      "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-3]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-3",
+    "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-4",
+      "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-4]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-4",
+    "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-5",
+      "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-5]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-5",
+    "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
     ],
-    "name": "ct-get_images_from_skps-1",
+    "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
     ],
-    "name": "ct-get_images_from_skps-2",
+    "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
     ],
-    "name": "ct-get_images_from_skps-3",
+    "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
     ],
-    "name": "ct-get_images_from_skps-4",
+    "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
     ],
-    "name": "ct-get_images_from_skps-5",
+    "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
index 56634fbc80..9de521693d 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-1",
+      "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-1]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-1",
+    "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-2",
+      "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-2]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-2",
+    "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-3",
+      "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-3]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-3",
+    "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-4",
+      "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-4]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-4",
+    "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-5",
+      "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-5]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-5",
+    "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
     ],
-    "name": "ct-get_images_from_skps-1",
+    "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
     ],
-    "name": "ct-get_images_from_skps-2",
+    "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
     ],
-    "name": "ct-get_images_from_skps-3",
+    "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
     ],
-    "name": "ct-get_images_from_skps-4",
+    "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
     ],
-    "name": "ct-get_images_from_skps-5",
+    "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
index f1552d894c..e4c9424c1b 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@@ -969,12 +969,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-1",
+      "stepname:ct-get_images_from_skps-1 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-1]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-1",
+    "name": "[trigger] ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1041,12 +1039,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-2",
+      "stepname:ct-get_images_from_skps-2 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-2]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-2",
+    "name": "[trigger] ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1113,12 +1109,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-3",
+      "stepname:ct-get_images_from_skps-3 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-3]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-3",
+    "name": "[trigger] ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1185,12 +1179,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-4",
+      "stepname:ct-get_images_from_skps-4 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-4]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-4",
+    "name": "[trigger] ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1257,12 +1249,10 @@
       "--tag",
       "revision:abc123",
       "--tag",
-      "slavename:skiabot-linux-swarm-000",
-      "--tag",
-      "stepname:ct-get_images_from_skps-5",
+      "stepname:ct-get_images_from_skps-5 on Ubuntu-14.04",
       "[dummy hash for ct-get_images_from_skps-5]"
     ],
-    "name": "[trigger] ct-get_images_from_skps-5",
+    "name": "[trigger] ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1297,7 +1287,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1"
     ],
-    "name": "ct-get_images_from_skps-1",
+    "name": "ct-get_images_from_skps-1 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1359,7 +1349,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2"
     ],
-    "name": "ct-get_images_from_skps-2",
+    "name": "ct-get_images_from_skps-2 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1421,7 +1411,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3"
     ],
-    "name": "ct-get_images_from_skps-3",
+    "name": "ct-get_images_from_skps-3 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1483,7 +1473,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4"
     ],
-    "name": "ct-get_images_from_skps-4",
+    "name": "ct-get_images_from_skps-4 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1535,7 @@
       "--task-output-dir",
       "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5"
     ],
-    "name": "ct-get_images_from_skps-5",
+    "name": "ct-get_images_from_skps-5 on Ubuntu-14.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py
index 20142fc7b8..7f998eaa9d 100644
--- a/infra/bots/recipes/swarm_ct_skps.py
+++ b/infra/bots/recipes/swarm_ct_skps.py
@@ -8,7 +8,7 @@ import math
 
 DEPS = [
   'build/file',
-  'build/gsutil',
+  'depot_tools/gsutil',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
@@ -426,7 +426,7 @@ def GenTests(api):
 
   yield(
     api.test('CT_DM_1m_SKPs_slave3_failure') +
-    api.step_data('ct-dm-3', retcode=1) +
+    api.step_data('ct-dm-3 on Ubuntu-14.04', retcode=1) +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
         mastername=mastername,
@@ -443,8 +443,8 @@ def GenTests(api):
 
   yield(
     api.test('CT_DM_1m_SKPs_2slaves_failure') +
-    api.step_data('ct-dm-1', retcode=1) +
-    api.step_data('ct-dm-3', retcode=1) +
+    api.step_data('ct-dm-1 on Ubuntu-14.04', retcode=1) +
+    api.step_data('ct-dm-3 on Ubuntu-14.04', retcode=1) +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
         mastername=mastername,
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 1baecce9f9..9927445dbb 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -5,17 +5,17 @@ deps {
   project_id: "build"
   url: "https://chromium.googlesource.com/chromium/tools/build.git"
   branch: "master"
-  revision: "2ce6852980b606d89021802beb1595081a41da69"
+  revision: "6a6634978807dd52ee5c60bc9d16cb0849232adc"
 }
 deps {
   project_id: "depot_tools"
   url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
   branch: "master"
-  revision: "d3661e4180ef3ed2f423f366f8fe7cc25b4dbeaa"
+  revision: "c5b4af697b4018fe31806c687255971fd5124aa3"
 }
 deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "2caf59ff4bdd1b0aad8612376263af1f073d2cd3"
+  revision: "f9018a9957d36e4149083cb3a6a0fdca619c9706"
 }