From 8e0c2c98322f500cb4d8b66545b41a3e4fdcf0ed Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Wed, 27 Sep 2017 13:03:35 -0400 Subject: Manually roll recipe DEPS Bug: skia: Change-Id: I55641aa4bef5a7ac863e3aae3d2902ef408f0384 Reviewed-on: https://skia-review.googlesource.com/52121 Commit-Queue: Eric Boren Reviewed-by: Ravi Mistry --- PRESUBMIT.py | 6 +++- infra/bots/README.recipes.md | 38 +++++++++++----------- .../full.expected/always-use-exparchive.json | 3 +- .../isolate/examples/full.expected/basic.json | 3 +- .../isolate/examples/full.expected/discover.json | 3 +- .../full.expected/exparchive-batch-bmiss.json | 3 +- .../full.expected/exparchive-batch-emiss.json | 3 +- .../examples/full.expected/exparchive-batch.json | 3 +- .../examples/full.expected/exparchive-miss.json | 3 +- .../full.expected/exparchive-multi-miss.json | 3 +- .../examples/full.expected/exparchive-multi.json | 3 +- .../isolate/examples/full.expected/exparchive.json | 3 +- .../isolate/examples/full.expected/extra.json | 3 +- .../isolate/examples/full.expected/missing.json | 3 +- .../isolate/examples/full.expected/none.json | 3 +- .../skia_swarming/examples/full.expected/test.json | 3 +- .../swarming/examples/full.expected/basic.json | 3 +- .../show_isolated_out_in_collect_step.json | 3 +- .../full.expected/show_shards_in_collect_step.json | 3 +- .../full.expected/swarming_expired_new.json | 3 +- .../full.expected/swarming_expired_old.json | 3 +- .../full.expected/swarming_timeout_new.json | 3 +- .../full.expected/swarming_timeout_old.json | 3 +- .../swarming/examples/full.expected/trybot.json | 3 +- .../examples/full.expected/basic.json | 3 +- infra/bots/recipes.py | 15 +++++++-- .../ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 3 +- .../recipes/ct_skps.expected/CT_DM_100k_SKPs.json | 3 +- .../recipes/ct_skps.expected/CT_DM_10k_SKPs.json | 3 +- .../ct_skps.expected/CT_DM_10k_SKPs_Trybot.json | 3 +- .../recipes/ct_skps.expected/CT_DM_1m_SKPs.json | 3 +- .../CT_DM_1m_SKPs_2slaves_failure.json | 3 +- .../CT_DM_1m_SKPs_slave3_failure.json | 3 +- .../ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 3 +- .../ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json | 3 +- .../ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 3 +- .../ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 3 +- .../CT_IMG_DECODE_10k_SKPs_Trybot.json | 3 +- infra/config/recipes.cfg | 4 +-- 39 files changed, 108 insertions(+), 60 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 4bea7099dd..c60392ea49 100644 --- 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, diff --git a/infra/bots/README.recipes.md b/infra/bots/README.recipes.md index ba3e3c17f7..eebbfd4f50 100644 --- a/infra/bots/README.recipes.md +++ b/infra/bots/README.recipes.md @@ -842,22 +842,22 @@ Recipe for the Bot that updates meta config. — **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 diff --git 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 index 1f5ffa13e5..8028783049 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/basic.json b/infra/bots/recipe_modules/isolate/examples/full.expected/basic.json index 9ef2ef3e1f..bbee58a9c0 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/discover.json b/infra/bots/recipe_modules/isolate/examples/full.expected/discover.json index d6ab964321..b4034c5954 100644 --- 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": { diff --git 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 index 75d1af4b5f..325694df2e 100644 --- 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": { diff --git 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 index 142ebd592a..e82f10f128 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-batch.json index e2d26d6f45..c056efe9c3 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-miss.json index 06eceaa787..54a570e300 100644 --- 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": { diff --git 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 index 02131c3553..07f5865814 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive-multi.json index 871423dbd7..2aaea20c3d 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json b/infra/bots/recipe_modules/isolate/examples/full.expected/exparchive.json index 33fadc15dd..2f9d7aeead 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/extra.json b/infra/bots/recipe_modules/isolate/examples/full.expected/extra.json index 3f1987d987..a23a60205c 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/missing.json b/infra/bots/recipe_modules/isolate/examples/full.expected/missing.json index 90e1e95dd7..a8c5204746 100644 --- 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": { diff --git a/infra/bots/recipe_modules/isolate/examples/full.expected/none.json b/infra/bots/recipe_modules/isolate/examples/full.expected/none.json index 335b6227d1..9a7c9c4e41 100644 --- 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": { diff --git a/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json b/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json index 51801658d0..219cb4ad2d 100644 --- 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": { diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json b/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json index 3ee20d6d7d..3c18aa560b 100644 --- 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": { diff --git 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 index acce4ef888..38afd52474 100644 --- 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": { diff --git 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 index 23548d8a88..72cd54cf25 100644 --- 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": { diff --git 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 index 13fceacf6d..eb7dc36d5e 100644 --- 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": { diff --git 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 index 0692854820..7c7392024f 100644 --- 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": { diff --git 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 index 3e8d7fe6ad..ec37f8a919 100644 --- 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": { diff --git 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 index 52d02bd4cf..6f81b16e11 100644 --- 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": { diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json b/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json index 79ecb1cb6a..d47c517c0a 100644 --- 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": { diff --git a/infra/bots/recipe_modules/swarming_client/examples/full.expected/basic.json b/infra/bots/recipe_modules/swarming_client/examples/full.expected/basic.json index 373746e2dd..a70e284666 100644 --- 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": { diff --git a/infra/bots/recipes.py b/infra/bots/recipes.py index b3ff3e72ef..fe6589d6f6 100755 --- 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 diff --git 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 index 09fe3775d9..e83e2f1838 100644 --- 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": { diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index db7f576a8a..467395c577 100644 --- 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": { diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index ce8a9bbeae..604932dddd 100644 --- 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": { diff --git 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 index 5a3d9636c4..676011eddf 100644 --- 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": { diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index edf0dc50c8..dd3c817ec9 100644 --- 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": { diff --git 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 index a7d61fcef8..e8e4e0e44d 100644 --- 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": { diff --git 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 index c2ce7ee027..6dfe14bbb6 100644 --- 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": { diff --git 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 index e24b5531c5..d715b55540 100644 --- 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": { diff --git 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 index 86c7e90def..5d681ec4ee 100644 --- 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": { diff --git 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 index db9879a2fc..772b491730 100644 --- 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": { diff --git 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 index 849f5e73b7..f1cee2941d 100644 --- 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": { diff --git 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 index 9afdb75847..61ab348ed9 100644 --- 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": { diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 95c4abb3bb..15987162cc 100644 --- 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" } }, -- cgit v1.2.3