Revert of Disable bootstrap for recipes.py invocations in autoroll

recipe_engine/autoroll.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 from __future__ import print_function
 
 import json
 import os
 import subprocess
 import sys
@@ skipping 90 matching lines @@
 def fetch(repo_root, package_spec):
   """
   Just fetch the recipes to the newly configured version.
   """
   # Use _local_ recipes.py, so that it checks out the pinned recipe engine,
   # rather than running recipe engine which may be at a different revision
   # than the pinned one.
   args = [
     sys.executable,
     os.path.join(repo_root, package_spec.recipes_path, 'recipes.py'),
-    # Invoked recipes.py should not re-bootstrap (to avoid issues on bots).
-    '--disable-bootstrap',
     'fetch',
   ]
   subprocess.check_call(args)
 
 
 def run_simulation_test(repo_root, package_spec, additional_args=None,
                         allow_fetch=False):
   """
   Runs recipe simulation test for given package.
 
   Returns a tuple of exit code and output.
   """
   # Use _local_ recipes.py, so that it checks out the pinned recipe engine,
   # rather than running recipe engine which may be at a different revision
   # than the pinned one.
   args = [
     sys.executable,
     os.path.join(repo_root, package_spec.recipes_path, 'recipes.py'),
-    # Invoked recipes.py should not re-bootstrap (to avoid issues on bots).
-    '--disable-bootstrap',
   ]
   if not allow_fetch:
     args.append('--no-fetch')
   args.append('test')
   if additional_args:
     args.extend(additional_args)
   p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
   output, _ = p.communicate()
   rc = p.returncode
   return rc, output
@@ skipping 129 matching lines @@
       config_file.write(package_spec.dump())
       run_simulation_test(context.repo_root, package_spec, ['train'],
                           allow_fetch=True)
 
   if args.output_json:
     with open(args.output_json, 'w') as f:
       json.dump(
           results, f, default=default_json_encode, sort_keys=True, indent=4)
 
   return 0