Revert "Update isolate binaries and update isolate recipe"

This reverts commit 8bc327bffb7ae7d10b93ee75c3d207caeb37f93b.

Reason for revert: Isolate tests step in CT_ bots taking 5x longer.

Original change's description:
> Update isolate binaries and update isolate recipe
> 
> Context: Email to skiabot@ from mcgreevy@
> 
> Bug: skia:
> Change-Id: Ic3bc19600809bde5adcd9edd23ba4d8b126ec852
> Reviewed-on: https://skia-review.googlesource.com/88540
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Ravi Mistry <rmistry@google.com>

TBR=benjaminwagner@google.com,rmistry@google.com,kjlubick@google.com

Change-Id: Ifda029a65bf6414dc40502356870101ac3f88cb8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/89280
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

23 files changed, 63 insertions, 1843 deletions

diff --git a/infra/bots/recipe_modules/isolate/api.py b/infra/bots/recipe_modules/isolate/api.py
index 296c233da2..4b3daa2085 100644
--- a/infra/bots/recipe_modules/isolate/api.py
+++ b/infra/bots/recipe_modules/isolate/api.py
@@ -91,7 +91,7 @@ class IsolateApi(recipe_api.RecipeApi):
       step_result.presentation.status = self.m.step.WARNING
 
   def isolate_tests(self, build_dir, targets=None, verbose=False,
-                    set_swarm_hashes=True, use_exparchive=False,
+                    set_swarm_hashes=True, always_use_exparchive=False,
                     **kwargs):
     """Archives prepared tests in |build_dir| to isolate server.
 
@@ -135,10 +135,10 @@ class IsolateApi(recipe_api.RecipeApi):
       return
 
     batch_targets = []
-    archive_targets = []
+    exparchive_targets = []
     for t in targets:
-      if t.endswith('_exparchive'):
-        archive_targets.append(t)
+      if t.endswith('_exparchive') or always_use_exparchive:
+        exparchive_targets.append(t)
       else:
         batch_targets.append(t)
 
@@ -146,13 +146,13 @@ class IsolateApi(recipe_api.RecipeApi):
     try:
       args = [
           self.m.swarming_client.path,
-          'archive',
+          'exparchive',
           '--dump-json', self.m.json.output(),
           '--isolate-server', self._isolate_server,
           '--eventlog-endpoint', 'prod',
       ] + (['--verbose'] if verbose else [])
 
-      for target in archive_targets:
+      for target in exparchive_targets:
         isolate_steps.append(
             self.m.python(
                 'isolate %s' % target,
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/always-use-exparchive.json b/infra/bots/recipe_modules/isolate/examples/full.expected/always-use-exparchive.json
index 1719129ed4..8028783049 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/always-use-exparchive.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/always-use-exparchive.json
@@ -94,9 +94,9 @@
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"test2\"@@@",
       "@@@STEP_LOG_LINE@json.output@]@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
@@ -128,7 +128,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
@@ -154,18 +154,47 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "batcharchive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
+      "--eventlog-endpoint",
+      "prod",
+      "--isolate",
+      "RECIPE_PACKAGE_REPO[skia]/test1.isolate",
+      "--isolated",
+      "RECIPE_PACKAGE_REPO[skia]/test1.isolated"
     ],
-    "name": "isolate tests",
+    "name": "isolate test1",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
+      "[START_DIR]/swarming.client",
+      "exparchive",
+      "--dump-json",
+      "/path/to/tmp/json",
+      "--isolate-server",
+      "https://isolateserver-dev.appspot.com",
+      "--eventlog-endpoint",
+      "prod",
+      "--isolate",
+      "RECIPE_PACKAGE_REPO[skia]/test2.isolate",
+      "--isolated",
+      "RECIPE_PACKAGE_REPO[skia]/test2.isolated"
+    ],
+    "name": "isolate test2",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-bmiss.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-bmiss.json
index e42dc67efd..325694df2e 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-bmiss.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-bmiss.json
@@ -131,7 +131,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-emiss.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-emiss.json
index 596c2e7a3f..e82f10f128 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-emiss.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch-emiss.json
@@ -131,7 +131,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
index 1719129ed4..c056efe9c3 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
@@ -128,7 +128,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
index 9a8dccea8f..54a570e300 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
@@ -126,7 +126,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi-miss.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi-miss.json
index ee20c658dc..07f5865814 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi-miss.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi-miss.json
@@ -129,7 +129,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
@@ -155,7 +155,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
index d78eacb967..2aaea20c3d 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
@@ -126,7 +126,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
@@ -152,7 +152,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
index dcbf0053ec..2f9d7aeead 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
@@ -124,7 +124,7 @@
       "-u",
       "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
       "[START_DIR]/swarming.client",
-      "archive",
+      "exparchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build1.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build1.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build1.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build10.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build10.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build10.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build2.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build2.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build2.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build3.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build3.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build3.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build4.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build4.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build4.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build5.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build5.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build5.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build6.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build6.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build6.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build7.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build7.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build7.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build8.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build8.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build8.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build9.json b/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build9.json
deleted file mode 100644
index 1719129ed4..0000000000
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/use-exparchive-20percent-build9.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/swarming.client",
-      "--url",
-      "https://chromium.googlesource.com/external/swarming.client.git"
-    ],
-    "name": "git setup (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "retry",
-      "fetch",
-      "origin",
-      "master",
-      "--progress"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "env": {
-      "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git fetch (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git checkout (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "read revision",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "git clean (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule sync (swarming_client)"
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/swarming.client",
-    "infra_step": true,
-    "name": "submodule update (swarming_client)"
-  },
-  {
-    "cmd": [
-      "cat"
-    ],
-    "name": "read test spec",
-    "stdout": "/path/to/tmp/json",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/find_isolated_tests.py",
-      "--build-dir",
-      "RECIPE_PACKAGE_REPO[skia]",
-      "--output-json",
-      "/path/to/tmp/json"
-    ],
-    "name": "find isolated tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "archive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "--eventlog-endpoint",
-      "prod",
-      "--isolate",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolate",
-      "--isolated",
-      "RECIPE_PACKAGE_REPO[skia]/test_exparchive.isolated"
-    ],
-    "name": "isolate test_exparchive",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test_exparchive\": \"[dummy hash for test_exparchive]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[skia::isolate]/resources/isolate.py",
-      "[START_DIR]/swarming.client",
-      "batcharchive",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--isolate-server",
-      "https://isolateserver-dev.appspot.com",
-      "RECIPE_PACKAGE_REPO[skia]/test1.isolated.gen.json",
-      "RECIPE_PACKAGE_REPO[skia]/test2.isolated.gen.json"
-    ],
-    "name": "isolate tests",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test1\": \"[dummy hash for test1]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"test2\": \"[dummy hash for test2]\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test1\": \"[dummy hash for test1]\", \"test2\": \"[dummy hash for test2]\", \"test_exparchive\": \"[dummy hash for test_exparchive]\"}@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/isolate/examples/full.py b/infra/bots/recipe_modules/isolate/examples/full.py
index b26c81c91c..7dfa009f65 100644
--- a/infra/bots/recipe_modules/isolate/examples/full.py
+++ b/infra/bots/recipe_modules/isolate/examples/full.py
@@ -20,14 +20,12 @@ DEPS = [
 ]
 
 PROPERTIES = {
-  'use_exparchive': Property(
-    kind=int, help="Force usage of exparchive.", default=0),
-  'buildnumber': Property(
-    kind=int, help="Number for the build.", default=100),
+  'always_use_exparchive': Property(
+    kind=bool, help="Force usage of exparchive.", default=False),
 }
 
 
-def RunSteps(api, use_exparchive):
+def RunSteps(api, always_use_exparchive):
   # 'isolate_tests' step needs swarming checkout.
   api.swarming_client.checkout('master')
 
@@ -50,7 +48,8 @@ def RunSteps(api, use_exparchive):
   # None.
   if expected_targets is not None:
     api.isolate.isolate_tests(
-        build_path, expected_targets, use_exparchive=use_exparchive)
+        build_path, expected_targets,
+        always_use_exparchive=always_use_exparchive)
 
 
 def GenTests(api):
@@ -142,15 +141,7 @@ def GenTests(api):
   # Use force-exparchive
   yield make_test(
       'always-use-exparchive',
-      ['test1', 'test2'],
-      ['test_exparchive'],
+      [],
+      ['test_exparchive', 'test1', 'test2'],
       ['test_exparchive', 'test1', 'test2']) + api.properties(
-          use_exparchive=True)
-  # Use force-exparchive
-  for i in range(1, 11):
-    yield make_test(
-        'use-exparchive-20percent-build%i' % i,
-        ['test1', 'test2'],
-        ['test_exparchive'],
-        ['test_exparchive', 'test1', 'test2']) + api.properties(
-              use_exparchive=20, buildnumber=i)
+          always_use_exparchive=True)
diff --git a/infra/bots/tools/luci-go/linux64/isolate.sha1 b/infra/bots/tools/luci-go/linux64/isolate.sha1
index 9162638599..e49fdc70ea 100644
--- a/infra/bots/tools/luci-go/linux64/isolate.sha1
+++ b/infra/bots/tools/luci-go/linux64/isolate.sha1
@@ -1 +1 @@
-3edf192dfe8e2b9c5e89e3885b7bb27bac3450f0
+0c5f61171e70fabea55489eccb330687e94a43a3
diff --git a/infra/bots/tools/luci-go/mac64/isolate.sha1 b/infra/bots/tools/luci-go/mac64/isolate.sha1
index d7f394d3fd..1c79cd34ff 100644
--- a/infra/bots/tools/luci-go/mac64/isolate.sha1
+++ b/infra/bots/tools/luci-go/mac64/isolate.sha1
@@ -1 +1 @@
-869b8c39e30c2b19fa82be5eb4642f29720ba634
+f79355e863ef6e67a074ed85b043db81376ffbde
diff --git a/infra/bots/tools/luci-go/win64/isolate.exe.sha1 b/infra/bots/tools/luci-go/win64/isolate.exe.sha1
index 5f3b0be90a..725910c600 100644
--- a/infra/bots/tools/luci-go/win64/isolate.exe.sha1
+++ b/infra/bots/tools/luci-go/win64/isolate.exe.sha1
@@ -1 +1 @@
-dd9791d5ac0e667a17ded140c3bf0bf9673b0da5
+a7682ca46f9ac393f3e8c3b8feb4aa7cef49693f