Manually roll recipes (trivial)

build:
  https://crrev.com/758ae9ec2bff2bb48071f78b80af3f84177870e4 Roll recipe dependencies (trivial).
  https://crrev.com/0796b26a2bbec373b875a604d1adfa6b8a7b9b75 Roll recipe dependencies (trivial).
  https://crrev.com/a14699eda6eb7971c71167d36901e2a374f6b744 Remove old recipe expectations
  https://crrev.com/2e802841367cdd8c47fb5a1b42f898948265b402 Roll recipe dependencies (trivial).
  https://crrev.com/34cf1f66235a1b70e97519055cbcff298971dd19 Remove recipe roller master from Kitchen whitelist
  https://crrev.com/f4a7f3ea36bd971090d02fa8dac321f0bfc867c1 Roll recipe dependencies (trivial).

depot_tools:
  https://crrev.com/0d6b46e32b99c7f6b7ecef5cde843aaf4e43449a git cl comment: require explicit --codereview with -i|--issue flag.
  https://crrev.com/aebadcc3a4349a0845fcab60242c6b146d0db1c8 Roll recipe dependencies (trivial).
  https://crrev.com/742adbd76f8d4c730866ba02d2e4b71524ce9049 Run new recipes 'test' command
  https://crrev.com/328f60d1a072d24b07e2726d447aa7c089c7b07e Roll recipe dependencies (trivial).

recipe_engine:
  https://crrev.com/aa0a2d61cd31decf9a5c048b677ba38eb209a1c6 Correctly handle tricky characters in test names in new 'test' command
  https://crrev.com/81de92519dd374d9b193362034fae8861476bc5f [autoroll] make autoroller propagate changes to recipes.py.
  https://crrev.com/0ee0446195595e5df02fc2dc82e4988b601b113e Carefully clean more unused recipe expectation directories in new 'test' command
  https://crrev.com/803d6ead998b4bbca601fb3a984e76ddc063806d Fix autoroll command.

Bug: skia:
Change-Id: I1a2bf0bf64b3ec9b27df785fcbf7d4b9e28727ac
Reviewed-on: https://skia-review.googlesource.com/10125
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

2 files changed, 15 insertions, 6 deletions

diff --git a/infra/bots/recipes.py b/infra/bots/recipes.py
index dda594e28b..7bc4107ac4 100755
--- a/infra/bots/recipes.py
+++ b/infra/bots/recipes.py
@@ -17,6 +17,11 @@ PER-REPO CONFIGURATION section to look like this one.
 
 import os
 
+# IMPORTANT: Do not alter the header or footer line for the
+# "PER-REPO CONFIGURATION" section below, or the autoroller will not be able
+# to automatically update this file! All lines between the header and footer
+# lines will be retained verbatim by the autoroller.
+
 #### PER-REPO CONFIGURATION (editable) ####
 # The root of the repository relative to the directory of this file.
 REPO_ROOT = os.path.join(os.pardir, os.pardir)
@@ -36,6 +41,7 @@ import subprocess
 import sys
 import time
 import traceback
+import urlparse
 
 from cStringIO import StringIO
 
@@ -72,7 +78,7 @@ def parse(repo_root, recipes_cfg_path):
       raise ValueError('could not find recipe_engine dep in %r'
                        % recipes_cfg_path)
     engine_url = engine['url']
-    engine_revision = engine['revision']
+    engine_revision = engine.get('revision', '')
     engine_subpath = engine.get('path_override', '')
     recipes_path = pb.get('recipes_path', '')
   else:
@@ -92,7 +98,7 @@ def parse(repo_root, recipes_cfg_path):
         b for b in protobuf.get('deps', [])
         if b.get('project_id') == ['recipe_engine'] ])
     engine_url = get_unique(engine_buf['url'])
-    engine_revision = get_unique(engine_buf['revision'])
+    engine_revision = get_unique(engine_buf.get('revision', ['']))
     engine_subpath = (get_unique(engine_buf.get('path_override', ['']))
                       .replace('/', os.path.sep))
     recipes_path = get_unique(protobuf.get('recipes_path', ['']))
@@ -202,9 +208,12 @@ def main():
   engine_url, engine_revision, engine_subpath, recipes_path = parse(
     repo_root, recipes_cfg_path)
 
-  deps_path = os.path.join(recipes_path, '.recipe_deps')
   engine_path = find_engine_override(sys.argv[1:])
+  if not engine_path and engine_url.startswith('file://'):
+    engine_path = urlparse.urlparse(engine_url).path
+
   if not engine_path:
+    deps_path = os.path.join(recipes_path, '.recipe_deps')
     # Ensure that we have the recipe engine cloned.
     engine_root_path = os.path.join(deps_path, 'recipe_engine')
     engine_path = os.path.join(engine_root_path, engine_subpath)
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 8638036cc5..ff33dea65e 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -5,17 +5,17 @@ deps {
   project_id: "build"
   url: "https://chromium.googlesource.com/chromium/tools/build.git"
   branch: "master"
-  revision: "e0f3d95ef043b98fcceb1f34b03f9b8fac091eb9"
+  revision: "f4a7f3ea36bd971090d02fa8dac321f0bfc867c1"
 }
 deps {
   project_id: "depot_tools"
   url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
   branch: "master"
-  revision: "0bbe6fa00ef873080c4f6d145ea7a00497eeed3f"
+  revision: "328f60d1a072d24b07e2726d447aa7c089c7b07e"
 }
 deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "e300f3a3b8193b84b88599faa30c0301e155c906"
+  revision: "803d6ead998b4bbca601fb3a984e76ddc063806d"
 }