Update CT bots to Debian-9.2

This has the side effect of using the bots in the new GCE project as
well.

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

19 files changed, 77 insertions, 321 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index acd422e701..a347b4fc36 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -590,7 +590,7 @@ func ctSKPs(b *specs.TasksCfgBuilder, name string) string {
 		CipdPackages: []*specs.CipdPackage{},
 		Dimensions: []string{
 			"pool:SkiaCT",
-			"os:Debian-9.1",
+			fmt.Sprintf("os:%s", DEFAULT_OS_LINUX_GCE),
 		},
 		ExecutionTimeout: 24 * time.Hour,
 		ExtraArgs: []string{
diff --git a/infra/bots/recipe_modules/ct/__init__.py b/infra/bots/recipe_modules/ct/__init__.py
index bc2ae39f8d..6e6b7f21e2 100644
--- a/infra/bots/recipe_modules/ct/__init__.py
+++ b/infra/bots/recipe_modules/ct/__init__.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 DEPS = [
-  'depot_tools/gsutil',
+  'gsutil',
   'recipe_engine/file',
   'recipe_engine/path',
   'recipe_engine/step',
diff --git a/infra/bots/recipe_modules/ct/api.py b/infra/bots/recipe_modules/ct/api.py
index e14cbd745e..fc7ef159fc 100644
--- a/infra/bots/recipe_modules/ct/api.py
+++ b/infra/bots/recipe_modules/ct/api.py
@@ -46,7 +46,7 @@ class CTApi(recipe_api.RecipeApi):
       gsutil_args.append('%s/%s/*.skp' % (str(remote_dir), i))
     gsutil_args.append(str(slave_dest_dir))
     try:
-      self.m.gsutil(gsutil_args, use_retry_wrapper=False)
+      self.m.gsutil('gsutil cp', *gsutil_args)
     except self.m.step.StepFailure:
       # Some subdirectories might have no SKPs in them.
       pass
diff --git a/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json b/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json
index ac5bb00e82..dbdcbcc9d9 100644
--- a/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json
+++ b/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json
@@ -29,10 +29,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp",
@@ -137,11 +134,10 @@
       "gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp",
       "[START_DIR]/skps/slave0"
     ],
-    "infra_step": true,
     "name": "gsutil cp",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
-      "@@@STEP_EXCEPTION@@@"
+      "@@@STEP_FAILURE@@@"
     ]
   },
   {
diff --git a/infra/bots/recipe_modules/ct/examples/full.expected/test.json b/infra/bots/recipe_modules/ct/examples/full.expected/test.json
index 8fcdfd8c93..e7ddda8d42 100644
--- a/infra/bots/recipe_modules/ct/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/ct/examples/full.expected/test.json
@@ -29,10 +29,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp",
@@ -137,7 +134,6 @@
       "gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp",
       "[START_DIR]/skps/slave0"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
diff --git a/infra/bots/recipe_modules/gsutil/api.py b/infra/bots/recipe_modules/gsutil/api.py
index babf85270b..8467354a75 100644
--- a/infra/bots/recipe_modules/gsutil/api.py
+++ b/infra/bots/recipe_modules/gsutil/api.py
@@ -8,6 +8,10 @@ from recipe_engine import recipe_api
 UPLOAD_ATTEMPTS = 5
 
 class GSUtilApi(recipe_api.RecipeApi):
+  def __call__(self, step_name, *args):
+    """Run gsutil with the given args."""
+    return self.m.step(step_name, cmd=['gsutil'] + list(args))
+
   def cp(self, name, src, dst, extra_args=None):
     """Attempt to upload or download files to/from Google Cloud Storage (GCS).
 
@@ -20,7 +24,7 @@ class GSUtilApi(recipe_api.RecipeApi):
 
     If the operation fails, it will be retried multiple times.
     """
-    cmd = ['gsutil', 'cp']
+    cmd = ['cp']
     if extra_args:
       cmd.extend(extra_args)
     cmd.extend([src, dst])
@@ -31,7 +35,7 @@ class GSUtilApi(recipe_api.RecipeApi):
       if i > 0:
         step_name += ' (attempt %d)' % (i+1)
       try:
-        self.m.step(step_name, cmd=cmd)
+        self(step_name, *cmd)
         break
       except self.m.step.StepFailure:
         if i == UPLOAD_ATTEMPTS - 1:
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 c77d7b406e..e506fe842b 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
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
index 97d785a5ee..f7a27bba6c 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
index 961789aa02..c8492ed8f0 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
index 402c5efa0b..9481af9817 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@@ -419,10 +419,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -437,7 +434,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -499,10 +495,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -517,7 +510,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -579,10 +571,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -597,7 +586,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -659,10 +647,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -677,7 +662,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -739,10 +723,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -757,7 +738,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
index 5cef74ab32..0d9f82bfd7 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
index 070cb63c0c..a7ba84eb8c 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
index 2cd09b411d..7339a681f2 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
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 f6afaefac6..c12f67593c 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
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
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 e6b44bf037..82a5b3f45f 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
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
index f5329a0de9..639f99c2d3 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
index 27f11ed3fb..e9a5f413bc 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
@@ -415,10 +415,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -433,7 +430,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -495,10 +491,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -513,7 +506,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -575,10 +567,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -593,7 +582,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -655,10 +643,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -673,7 +658,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -735,10 +719,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -753,7 +734,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
index 537cd93199..14006e63fd 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@@ -419,10 +419,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
@@ -437,7 +434,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
     ],
-    "infra_step": true,
     "name": "gsutil cp"
   },
   {
@@ -499,10 +495,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
@@ -517,7 +510,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
     ],
-    "infra_step": true,
     "name": "gsutil cp (2)"
   },
   {
@@ -579,10 +571,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
@@ -597,7 +586,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
     ],
-    "infra_step": true,
     "name": "gsutil cp (3)"
   },
   {
@@ -659,10 +647,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
@@ -677,7 +662,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
     ],
-    "infra_step": true,
     "name": "gsutil cp (4)"
   },
   {
@@ -739,10 +723,7 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "--",
+      "gsutil",
       "-m",
       "cp",
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
@@ -757,7 +738,6 @@
       "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
       "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
     ],
-    "infra_step": true,
     "name": "gsutil cp (5)"
   },
   {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e0c4634f63..2e2cf44f91 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -9063,7 +9063,7 @@
     "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.1"
+        "os:Debian-9.2"
       ],
       "execution_timeout_ns": 86400000000000,
       "extra_args": [
@@ -9086,7 +9086,7 @@
     "Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.1"
+        "os:Debian-9.2"
       ],
       "execution_timeout_ns": 86400000000000,
       "extra_args": [
@@ -18476,7 +18476,7 @@
     "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.1"
+        "os:Debian-9.2"
       ],
       "execution_timeout_ns": 86400000000000,
       "extra_args": [
@@ -18499,7 +18499,7 @@
     "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.1"
+        "os:Debian-9.2"
       ],
       "execution_timeout_ns": 86400000000000,
       "extra_args": [
@@ -18522,7 +18522,7 @@
     "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs": {
       "dimensions": [
         "pool:SkiaCT",
-        "os:Debian-9.1"
+        "os:Debian-9.2"
       ],
       "execution_timeout_ns": 86400000000000,
       "extra_args": [