[recipes] Manually roll recipes.

This commit changes the layout of recipe_engine a bit which breaks the
autoroller.

R=jchinlee@chromium.org, martiniss@chromium.org, tandrii@chromium.org

Bug: 913102
Change-Id: I207e6e5a13980e3819c2b4deb3c01c38c28ed876
Recipe-Manual-Change: infra
Recipe-Manual-Change: build
Recipe-Manual-Change: skia
Recipe-Manual-Change: skiabuildbot
Recipe-Manual-Change: build_limited_scripts_slave
Recipe-Manual-Change: release_scripts
Reviewed-on: https://chromium-review.googlesource.com/c/1368410
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>

infra/config/recipes.cfg

@@ -15,7 +15,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "7bf15aaea60841beb1973a1b0ec19f3be3ec53b2",
+      "revision": "095f4b84e4c62983829973f51f0c46f95022806a",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },

recipes/README.recipes.md

@@ -975,18 +975,18 @@ Move things around in a loop!
 
 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
 
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-source_manifest
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7bf15aaea60841beb1973a1b0ec19f3be3ec53b2/recipe_engine/recipe_api.py#1015
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-source_manifest
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/095f4b84e4c62983829973f51f0c46f95022806a/recipe_engine/recipe_api.py#1015

recipes/recipes.py

@@ -10,7 +10,7 @@
 ** DO NOT MODIFY **
 *******************
 
-This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/master/doc/recipes.py.
+This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/master/recipes.py.
 To fix bugs, fix in the googlesource repo then run the autoroller.
 """
 
@@ -73,7 +73,7 @@ def parse(repo_root, recipes_cfg_path):
       raise MalformedRecipesCfg('unknown version %d' % pb['api_version'],
                                 recipes_cfg_path)
 
-    # If we're running ./doc/recipes.py from the recipe_engine repo itself, then
+    # If we're running ./recipes.py from the recipe_engine repo itself, then
     # return None to signal that there's no EngineDep.
     if pb['project_id'] == 'recipe_engine':
       return None, pb.get('recipes_path', '')
@@ -132,7 +132,7 @@ def _git_output(argv, **kwargs):
 def parse_args(argv):
   """This extracts a subset of the arguments that this bootstrap script cares
   about. Currently this consists of:
-    * an override for the recipe engine in the form of `-O recipe_engin=/path`
+    * an override for the recipe engine in the form of `-O recipe_engine=/path`
     * the --package option.
   """
   PREFIX = 'recipe_engine='
@@ -211,7 +211,7 @@ def main():
 
   return _subprocess_call([
       VPYTHON, '-u',
-      os.path.join(engine_path, 'recipes.py')] + args)
+      os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
 
 
 if __name__ == '__main__':