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. recipe_engine: https://crrev.com/a71df95b9d2348c680f05746607e12822d34517e Final simplification to RecipeResult. (iannucci@chromium.org) R=recipe-roller@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I3ac4981a2c16031efcef7920647ead968069a0fc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1596994 Commit-Queue: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
7 years ago · 8c810f0c24
parent 80ee78e7fa
commit 8c810f0c24
21 changed files with 26 additions and 94 deletions
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@ -15,7 +15,7 @@
  "deps": {
    "recipe_engine": {
      "branch": "master",
-      "revision": "f95f160ff4e99f7c6b2e4cce06923e75cc158e26",
+      "revision": "a71df95b9d2348c680f05746607e12822d34517e",
      "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
    }
  },
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@ -997,19 +997,19 @@ Move things around in a loop!

 &mdash; **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/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-source_manifest
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f95f160ff4e99f7c6b2e4cce06923e75cc158e26/recipe_engine/recipe_api.py#838
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-source_manifest
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a71df95b9d2348c680f05746607e12822d34517e/recipe_engine/recipe_api.py#838
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@ -77,11 +77,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Infra Failure: Step('bot_update') returned 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
@ -175,9 +175,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "Patch failure"
-      },
+      "failure": {},
      "humanReason": "Step('Patch failure') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@ -175,11 +175,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Infra Failure: Step('Patch failure') returned 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
@ -1,11 +1,6 @@
 [
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "invalid (host, project) pair in buildbucket.build.input.gitiles_commit: (u'unrecognized', u'repo') does not match any of configured gclient solutions and not present in gclient_config.repo_path_map"
    },
    "name": "$result"
--- a/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json
@ -74,9 +74,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "cipd describe public/package/linux-amd64"
-      },
+      "failure": {},
      "humanReason": "Step('cipd describe public/package/linux-amd64') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
@ -283,11 +283,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Uncaught Exception: ValueError(\"path Path('start_dir', 'a','path','to','file.py') is not the package root Path('start_dir', 'some_subdir') and not a child thereof\",)"
    },
    "name": "$result"
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
@ -283,11 +283,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)"
    },
    "name": "$result"
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
@ -283,11 +283,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)"
    },
    "name": "$result"
--- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
@ -277,11 +277,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "1 out of 1 aggregated steps failed: Error querying for CL description: host:'https://chromium-review.googlesource.com' change:122; patchset:3"
    },
    "name": "$result"
--- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
@ -162,11 +162,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Infra Failure: Step('git status can_fail_build') returned 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
@ -107,11 +107,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "count-objects failed: invalid literal for long() with base 10: 'xxx'"
    },
    "name": "$result"
--- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
@ -219,11 +219,6 @@
  },
  {
    "failure": {
-      "exception": {
-        "traceback": [
-          "<omitted by recipe engine>"
-        ]
-      },
      "humanReason": "Infra Failure: Step('my repo rebase') returned 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json
@ -1,9 +1,7 @@
 [
  {
    "failure": {
-      "failure": {
-        "step": ""
-      },
+      "failure": {},
      "humanReason": "boom!"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
@ -137,9 +137,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
@ -137,9 +137,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json
@ -35,9 +35,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json
@ -35,9 +35,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json
@ -32,9 +32,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json
@ -33,9 +33,7 @@
  },
  {
    "failure": {
-      "failure": {
-        "step": "fail"
-      },
+      "failure": {},
      "humanReason": "Step('fail') failed with return_code 1"
    },
    "name": "$result"