From 6bb055bef632b46bed7ee8e350c5de2278c67145 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Ruel <maruel@chromium.org>
Date: Thu, 19 Jul 2018 17:37:09 +0000
Subject: [PATCH] tools/luci-go: remove old way of mapping isolate

It's now only mapped via CIPD, which is the right solution going forward.

Bug: 851596,865541
Change-Id: I25ddd0e059c818fafbc5587b06ff35b6c733a16e
Reviewed-on: https://chromium-review.googlesource.com/1143448
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576550}
---
 DEPS                                 | 38 ----------------------------
 tools/luci-go/.gitignore             |  3 ---
 tools/luci-go/linux64/isolate.sha1   |  1 -
 tools/luci-go/mac64/isolate.sha1     |  1 -
 tools/luci-go/win64/isolate.exe.sha1 |  1 -
 5 files changed, 44 deletions(-)
 delete mode 100644 tools/luci-go/linux64/isolate.sha1
 delete mode 100644 tools/luci-go/mac64/isolate.sha1
 delete mode 100644 tools/luci-go/win64/isolate.exe.sha1

diff --git a/DEPS b/DEPS
index 7b35167cbace28..e587a71f6692c2 100644
--- a/DEPS
+++ b/DEPS
@@ -1704,44 +1704,6 @@ hooks = [
                 '-d', 'src/chrome/build',
     ],
   },
-  # Pull luci-go binaries (isolate, swarming) using checked-in hashes.
-  # TODO(maruel): Remove, https://crbug.com/851596
-  {
-    'name': 'luci-go_win',
-    'pattern': '.',
-    'condition': 'host_os == "win"',
-    'action': [ 'python',
-                'src/third_party/depot_tools/download_from_google_storage.py',
-                '--no_resume',
-                '--no_auth',
-                '--bucket', 'chromium-luci',
-                '-d', 'src/tools/luci-go/win64',
-    ],
-  },
-  {
-    'name': 'luci-go_mac',
-    'pattern': '.',
-    'condition': 'host_os == "mac"',
-    'action': [ 'python',
-                'src/third_party/depot_tools/download_from_google_storage.py',
-                '--no_resume',
-                '--no_auth',
-                '--bucket', 'chromium-luci',
-                '-d', 'src/tools/luci-go/mac64',
-    ],
-  },
-  {
-    'name': 'luci-go_linux',
-    'pattern': '.',
-    'condition': 'host_os == "linux"',
-    'action': [ 'python',
-                'src/third_party/depot_tools/download_from_google_storage.py',
-                '--no_resume',
-                '--no_auth',
-                '--bucket', 'chromium-luci',
-                '-d', 'src/tools/luci-go/linux64',
-    ],
-  },
   # Pull the Syzygy binaries, used for optimization and instrumentation.
   # Remove this as soon as the zap_timestamp.exe utility is no longer used.
   # See https://crbug.com/821764#c3.
diff --git a/tools/luci-go/.gitignore b/tools/luci-go/.gitignore
index 05392602d90764..82911f3cca0416 100644
--- a/tools/luci-go/.gitignore
+++ b/tools/luci-go/.gitignore
@@ -1,6 +1,3 @@
 /isolate
 /isolate.exe
-/linux64/isolate
-/mac64/isolate
-/win64/isolate.exe
 .versions
diff --git a/tools/luci-go/linux64/isolate.sha1 b/tools/luci-go/linux64/isolate.sha1
deleted file mode 100644
index 16106572d64cf4..00000000000000
--- a/tools/luci-go/linux64/isolate.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9734e966a14f9e26f86e38a020fcd7584248d285
diff --git a/tools/luci-go/mac64/isolate.sha1 b/tools/luci-go/mac64/isolate.sha1
deleted file mode 100644
index a61e43abb38f3e..00000000000000
--- a/tools/luci-go/mac64/isolate.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18561de57e944d096521838b4e6cb49e0cc1df23
diff --git a/tools/luci-go/win64/isolate.exe.sha1 b/tools/luci-go/win64/isolate.exe.sha1
deleted file mode 100644
index 5ac52a0347f565..00000000000000
--- a/tools/luci-go/win64/isolate.exe.sha1
+++ /dev/null
@@ -1 +0,0 @@
-af227603890ea1d8c082b5caf15e46a6bf060a2e