Manually roll recipe DEPS

Bug: skia: Change-Id: I55641aa4bef5a7ac863e3aae3d2902ef408f0384 Reviewed-on: https://skia-review.googlesource.com/52121 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-09-27 13:03:35 -04:00 · 2017-09-27 13:03:35 -04:00 · 8e0c2c9832
commit 8e0c2c9832
parent 62ea0cd4a0
39 changed files with 108 additions and 60 deletions
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@ -74,6 +74,9 @@ def _CheckChangeHasEol(input_api, output_api, source_file_filter=None):

 def _PythonChecks(input_api, output_api):
  """Run checks on any modified Python files."""
+  pylint_disabled_files = (
+      'infra/bots/recipes.py',
+  )
  pylint_disabled_warnings = (
      'F0401',  # Unable to import.
      'E0611',  # No name in module.
@ -91,7 +94,8 @@ def _PythonChecks(input_api, output_api):
  for affected_file in input_api.AffectedSourceFiles(None):
    affected_file_path = affected_file.LocalPath()
    if affected_file_path.endswith('.py'):
-      affected_python_files.append(affected_file_path)
+      if affected_file_path not in pylint_disabled_files:
+        affected_python_files.append(affected_file_path)
  return input_api.canned_checks.RunPylint(
      input_api, output_api,
      disabled_warnings=pylint_disabled_warnings,
--- a/infra/bots/README.recipes.md
+++ b/infra/bots/README.recipes.md
@ -842,22 +842,22 @@ Recipe for the Bot that updates meta config.

 &mdash; **def [RunSteps](/infra/bots/recipe_modules/vars/examples/full.py#12)(api):**

-[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-bot_update
-[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-depot_tools
-[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-gclient
-[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-git
-[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-gsutil
-[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1bf0340381c2a6942e84fbd896da00df2cba32b1/recipes/README.recipes.md#recipe_modules-tryserver
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/tempfile]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-tempfile
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/README.recipes.md#recipe_modules-time
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/recipe_engine/recipe_api.py#992
-[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/54df660706538e94951f101607491e659e5e3ed1/recipe_engine/util.py#119
+[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-bot_update
+[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-depot_tools
+[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-gclient
+[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-git
+[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-gsutil
+[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/ced744fa465542223771a7383edadba107e6c041/recipes/README.recipes.md#recipe_modules-tryserver
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/tempfile]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-tempfile
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/README.recipes.md#recipe_modules-time
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/recipe_engine/recipe_api.py#992
+[recipe_engine/wkt/returns_placeholder]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a22165922f0da807ad5f27d82c9e953b9c4672c3/recipe_engine/util.py#119
--- 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
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/basic.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/basic.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/discover.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/discover.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- 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
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- 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
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- 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
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/extra.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/extra.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/missing.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/missing.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/isolate/examples/full.expected/none.json
+++ b/infra/bots/recipe_modules/isolate/examples/full.expected/none.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "abc123"
+      "abc123",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json
+++ b/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json
@ -17,7 +17,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipe_modules/swarming_client/examples/full.expected/basic.json
+++ b/infra/bots/recipe_modules/swarming_client/examples/full.expected/basic.json
@ -21,7 +21,8 @@
      "retry",
      "fetch",
      "origin",
-      "sample_sha"
+      "sample_sha",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes.py
+++ b/infra/bots/recipes.py
@ -10,8 +10,8 @@
 ** DO NOT MODIFY **
 *******************

-This is a copy of https://github.com/luci/recipes-py/blob/master/doc/recipes.py.
-To fix bugs, fix in the github repo then run the autoroller.
+This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/master/doc/recipes.py.
+To fix bugs, fix in the googlesource repo then run the autoroller.
 """

 import argparse
@ -59,7 +59,8 @@ def parse(repo_root, recipes_cfg_path):
    recipes_cfg_path (str) - native path to the recipes.cfg file to process.

  Returns (as tuple):
-    engine_dep (EngineDep): The recipe_engine dependency.
+    engine_dep (EngineDep|None): The recipe_engine dependency, or None, if the
+      current repo IS the recipe_engine.
    recipes_path (str) - native path to where the recipes live inside of the
      current repo (i.e. the folder containing `recipes/` and/or
      `recipe_modules`)
@ -72,6 +73,11 @@ 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
+    # return None to signal that there's no EngineDep.
+    if pb['project_id'] == 'recipe_engine':
+      return None, pb.get('recipes_path', '')
+
    engine = pb['deps']['recipe_engine']

    if 'url' not in engine:
@ -141,6 +147,9 @@ def parse_args(argv):

 def checkout_engine(engine_path, repo_root, recipes_cfg_path):
  dep, recipes_path = parse(repo_root, recipes_cfg_path)
+  if dep is None:
+    # we're running from the engine repo already!
+    return os.path.join(repo_root, recipes_path)

  url = dep.url

--- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@ -204,7 +204,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
@ -200,7 +200,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@ -204,7 +204,8 @@
      "retry",
      "fetch",
      "origin",
-      "master"
+      "master",
+      "--progress"
    ],
    "cwd": "[START_DIR]/swarming.client",
    "env": {
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@ -14,12 +14,12 @@
  "deps": {
    "depot_tools": {
      "branch": "master",
-      "revision": "1bf0340381c2a6942e84fbd896da00df2cba32b1",
+      "revision": "ced744fa465542223771a7383edadba107e6c041",
      "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
    },
    "recipe_engine": {
      "branch": "master",
-      "revision": "54df660706538e94951f101607491e659e5e3ed1",
+      "revision": "a22165922f0da807ad5f27d82c9e953b9c4672c3",
      "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
    }
  },