Make ct_skps and recreate_skps recipes shell to gsutil

# Trybots already ran @patchset3
NoTry: true
Bug: skia:7065
Change-Id: Ib961c5d85f9b1491efe2539dae47f6813590b8fa
Reviewed-on: https://skia-review.googlesource.com/50500
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

3 files changed, 60 insertions, 300 deletions

diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
index b0f7c0b470..78e89a365e 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
@@ -1257,12 +1257,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
@@ -1273,19 +1268,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
@@ -1296,10 +1283,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (2)"
   },
   {
     "cmd": [
@@ -1399,12 +1383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
@@ -1415,19 +1394,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (3)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (3)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
@@ -1438,10 +1409,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (4)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (4)"
   },
   {
     "cmd": [
@@ -1541,12 +1509,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
@@ -1557,19 +1520,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (5)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (5)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
@@ -1580,10 +1535,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (6)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (6)"
   },
   {
     "cmd": [
@@ -1683,12 +1635,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
@@ -1699,19 +1646,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (7)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (7)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
@@ -1722,10 +1661,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (8)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (8)"
   },
   {
     "cmd": [
@@ -1825,12 +1761,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
@@ -1841,19 +1772,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (9)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (9)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
@@ -1864,10 +1787,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (10)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (10)"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
index 4a637ec97d..24e26a9393 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@@ -1272,12 +1272,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
@@ -1288,19 +1283,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
@@ -1311,10 +1298,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (2)"
   },
   {
     "cmd": [
@@ -1414,12 +1398,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
@@ -1430,19 +1409,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (3)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (3)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
@@ -1453,10 +1424,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (4)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (4)"
   },
   {
     "cmd": [
@@ -1556,12 +1524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
@@ -1572,19 +1535,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (5)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (5)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
@@ -1595,10 +1550,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (6)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (6)"
   },
   {
     "cmd": [
@@ -1698,12 +1650,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
@@ -1714,19 +1661,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (7)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (7)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
@@ -1737,10 +1676,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (8)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (8)"
   },
   {
     "cmd": [
@@ -1840,12 +1776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
@@ -1856,19 +1787,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (9)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (9)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
@@ -1879,10 +1802,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (10)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (10)"
   },
   {
     "name": "$result",
diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
index 39b4820cd9..1d84d0c5db 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@@ -1272,12 +1272,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
@@ -1288,19 +1283,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
@@ -1311,10 +1298,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (2)"
   },
   {
     "cmd": [
@@ -1414,12 +1398,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
@@ -1430,19 +1409,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (3)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (3)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
@@ -1453,10 +1424,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (4)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (4)"
   },
   {
     "cmd": [
@@ -1556,12 +1524,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
@@ -1572,19 +1535,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (5)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (5)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
@@ -1595,10 +1550,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (6)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (6)"
   },
   {
     "cmd": [
@@ -1698,12 +1650,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
@@ -1714,19 +1661,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (7)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (7)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
@@ -1737,10 +1676,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (8)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (8)"
   },
   {
     "cmd": [
@@ -1840,12 +1776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
@@ -1856,19 +1787,11 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (9)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (9)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
+      "gsutil",
       "cp",
       "-R",
       "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
@@ -1879,10 +1802,7 @@
       "BOTO_CONFIG": null
     },
     "infra_step": true,
-    "name": "gsutil upload json output (10)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-perf/ct/10k/2012/05/14/12/@@@"
-    ]
+    "name": "upload json output (10)"
   },
   {
     "name": "$result",