Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
Please review the expectation changes, and LGTM+CQ.
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
https://crrev.com/43c083d5a4289d0f470be79c9d78b5b9916de3e5 Add missing options to git_rebase_update man page (dmcardle@chromium.org)
https://crrev.com/5f6b911ad015b2660547353753bcfe50ae932fe2 Roll vpython. (iannucci@chromium.org)
https://crrev.com/ccd2b4da9a7e6ddf126c0b4437db75201836154c Pruning old directories/ready files. (karenqian@google.com)
https://crrev.com/80ee78e7fa9f84c3b36cc57e02034dc726d782af Convert print statements to Python 3 style (raul@tambre.ee)
recipe_engine:
https://crrev.com/ec34fcd3b421c95e45a22bec90e9e676cd84928c Update implementation notes with information about magic_check_fn. (gbeaty@chromium.org)
https://crrev.com/f95f160ff4e99f7c6b2e4cce06923e75cc158e26 Add beefier access control to StepData, remove StepDataAttributeError. (iannucci@chromium.org)
https://crrev.com/a71df95b9d2348c680f05746607e12822d34517e Final simplification to RecipeResult. (iannucci@chromium.org)
https://crrev.com/b4dac2345a45f448221fba393266fbcf541619db [buildbucket] Add search limit (nodir@google.com)
https://crrev.com/a9d4612406b19eb642d31bff5b5a0705a783b5b0 Move StepData to its own file. (iannucci@chromium.org)
R=rmistry@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ia9a9245089fb8cb46369f31b4acf5c3138a68e7a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214660
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
index 05470c0..29fa0b8 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
@@ -940,11 +940,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('Scale CPU 0 to 0.600000 (attempt 3)') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
index 6f1278e..fdc53b6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
@@ -940,11 +940,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('Scale CPU 4 to 0.600000 (attempt 3)') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
index c4ef4b5..407761b 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
@@ -1086,9 +1086,7 @@
},
{
"failure": {
- "failure": {
- "step": ""
- },
+ "failure": {},
"humanReason": "Failed build steps: dump log"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
index 1508180..9db45d1 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
@@ -308,11 +308,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 3)') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
index 2df0826..ddf2585 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
@@ -147,11 +147,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('install_dm (attempt 2)') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json b/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
index a057b44..583eeb4 100644
--- a/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
+++ b/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
@@ -71,9 +71,7 @@
},
{
"failure": {
- "failure": {
- "step": "upload test file (attempt 5)"
- },
+ "failure": {},
"humanReason": "Step('upload test file (attempt 5)') failed with return_code 1"
},
"name": "$result"
diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json
index a360f7b..d893317 100644
--- a/infra/bots/recipe_modules/run/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json
@@ -281,9 +281,7 @@
},
{
"failure": {
- "failure": {
- "step": ""
- },
+ "failure": {},
"humanReason": "Failed build steps: fail, fail again, retry fail, retry fail (attempt 2), retry fail (attempt 3), retry fail (attempt 4), retry fail (attempt 5)"
},
"name": "$result"
diff --git a/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json b/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
index 3dddb93..58fccc3 100644
--- a/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
+++ b/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
@@ -1,11 +1,6 @@
[
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Uncaught Exception: Exception('Build-Debian9-Clang-cf_x86_phone-eng-Android_Framework can only be run as a trybot.',)"
},
"name": "$result"
diff --git a/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json b/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
index 82a90e3..a96ee38 100644
--- a/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
+++ b/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
@@ -38,9 +38,7 @@
},
{
"failure": {
- "failure": {
- "step": "Trigger and wait for task on android compile server"
- },
+ "failure": {},
"humanReason": "Step('Trigger and wait for task on android compile server') failed with return_code 1"
},
"name": "$result"
diff --git a/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json b/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
index 5bd8ef7..0ab6b0c 100644
--- a/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
+++ b/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
@@ -1,11 +1,6 @@
[
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Uncaught Exception: Exception('Lunch target in Build-Debian9-Clang-unrecognized-Android_Framework is not recognized.',)"
},
"name": "$result"
diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
index 3c44f0d..061c663 100644
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
@@ -557,9 +557,7 @@
},
{
"failure": {
- "failure": {
- "step": "parse lottie 3!.json trace"
- },
+ "failure": {},
"humanReason": "Step('parse lottie 3!.json trace') failed with return_code 1"
},
"name": "$result"
diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
index 5ce3cbb..13e75fe 100644
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@@ -228,9 +228,7 @@
},
{
"failure": {
- "failure": {
- "step": "Upload SKPs"
- },
+ "failure": {},
"humanReason": "Step('Upload SKPs') failed with return_code 1"
},
"name": "$result"
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index 5bf063c..d6a1ceb 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -286,9 +286,7 @@
},
{
"failure": {
- "failure": {
- "step": ""
- },
+ "failure": {},
"humanReason": "Failed build steps: symbolized dm, symbolized dm"
},
"name": "$result"
diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json
index e5de7bd..cd41c35 100644
--- a/infra/bots/recipes/test.expected/failed_pull.json
+++ b/infra/bots/recipes/test.expected/failed_pull.json
@@ -1005,11 +1005,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json
index de9e897..bcb8fe9 100644
--- a/infra/bots/recipes/test.expected/failed_push.json
+++ b/infra/bots/recipes/test.expected/failed_push.json
@@ -142,11 +142,6 @@
},
{
"failure": {
- "exception": {
- "traceback": [
- "<omitted by recipe engine>"
- ]
- },
"humanReason": "Infra Failure: Step('push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources') returned 1"
},
"name": "$result"
diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_all.json b/infra/bots/recipes/upload_dm_results.expected/failed_all.json
index 03ebaad..88e2a2f 100644
--- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json
+++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json
@@ -85,9 +85,7 @@
},
{
"failure": {
- "failure": {
- "step": "upload .png images (attempt 5)"
- },
+ "failure": {},
"humanReason": "Step('upload .png images (attempt 5)') failed with return_code 1"
},
"name": "$result"
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index b399b15..6eee34e 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -14,12 +14,12 @@
"deps": {
"depot_tools": {
"branch": "master",
- "revision": "de0b20d4cdf9bcf768314cefd57f34d09959cd44",
+ "revision": "a495093d1cfca850176b02a262a9c5a0c6b3f999",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"recipe_engine": {
"branch": "master",
- "revision": "e92521da4f987d5bf87b28d23770544e72a96dc5",
+ "revision": "a9d4612406b19eb642d31bff5b5a0705a783b5b0",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},