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 as normal. The recipe roller
will *NOT* CQ the change itself, so you must commit the change manually.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/d9039313202dfb6adaf890674abdd8ee6aec940d recipe engine: remove explicit cwd default in step recipe module (phajdan.jr@chromium.org)

R=phajdan.jr@chromium.org
BUG=chromium:605919

Review URL: https://codereview.chromium.org/1926633002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300229 0039d316-1c4b-4281-b951-d872f2087c98

infra/config/recipes.cfg

@@ -5,5 +5,5 @@ deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "2f86f02a302172514bf282684e0a4aa18b683e41"
+  revision: "d9039313202dfb6adaf890674abdd8ee6aec940d"
 }

recipe_modules/bot_update/example.expected/basic.json

@@ -23,7 +23,6 @@
       "--revision",
       "src@abc"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/basic_output_manifest.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/basic_with_branch_heads.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--with_branch_heads"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/clobber.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--clobber"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/forced.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--force"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/gerrit_no_reset.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--gerrit_no_reset"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/no_shallow.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--no_shallow"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/off.json

@@ -23,7 +23,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/reset_root_solution_revision.json

@@ -23,7 +23,6 @@
       "--revision",
       "src@revision"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/svn_mode.json

@@ -24,7 +24,6 @@
       "src@HEAD",
       "--force"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/trychange.json

@@ -25,7 +25,6 @@
       "--refs",
       "+refs/change/1/2/333"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/trychange_oauth2.json

@@ -27,7 +27,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/tryjob.json

@@ -25,7 +25,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/tryjob_fail.json

@@ -25,7 +25,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/tryjob_fail_patch.json

@@ -25,7 +25,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -67,7 +66,6 @@
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Patch failure",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json

@@ -25,7 +25,6 @@
       "--revision",
       "src@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -66,7 +65,6 @@
       "-u",
       "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "Patch failure",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json

@@ -29,7 +29,6 @@
       "--revision",
       "src/third_party/angle@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -47,4 +46,4 @@
     "recipe_result": null,
     "status_code": 0
   }
-]
+]
\ No newline at end of file

recipe_modules/bot_update/example.expected/tryjob_v8.json

@@ -27,7 +27,6 @@
       "--revision",
       "src/v8@abc"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json

@@ -31,7 +31,6 @@
       "--revision",
       "src/v8@HEAD"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/gclient/example.expected/basic.json

@@ -8,7 +8,6 @@
       "--spec",
       "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -32,7 +31,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -59,7 +57,6 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -76,7 +73,6 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -140,7 +136,6 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[SLAVE_BUILD]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -164,7 +159,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/gclient/example.expected/revision.json

@@ -8,7 +8,6 @@
       "--spec",
       "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -34,7 +33,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -61,7 +59,6 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -78,7 +75,6 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -142,7 +138,6 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[SLAVE_BUILD]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -166,7 +161,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/gclient/example.expected/tryserver.json

@@ -8,7 +8,6 @@
       "--spec",
       "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -34,7 +33,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -61,7 +59,6 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -78,7 +75,6 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -153,7 +149,6 @@
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[SLAVE_BUILD]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup index.lock",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -177,7 +172,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/git/example.expected/basic.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/basic_branch.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/basic_file_name.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/basic_hash.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/basic_ref.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/basic_submodule_update_force.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/can_fail_build.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/cannot_fail_build.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/cat-file_test.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/count-objects_delta.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/count-objects_failed.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/count-objects_with_bad_output.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/curl_trace_file.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/platform_win.json

@@ -18,7 +18,6 @@
       "--git_cmd_path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/rebase_failed.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/remote_not_origin.json

@@ -11,7 +11,6 @@
       "--remote",
       "not_origin"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/git/example.expected/set_got_revision.json

@@ -9,7 +9,6 @@
       "--url",
       "https://chromium.googlesource.com/chromium/src.git"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {

recipe_modules/presubmit/example.expected/basic.json

@@ -5,7 +5,6 @@
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

recipe_modules/rietveld/example.expected/basic.json

@@ -17,7 +17,6 @@
       "-k",
       "[BUILD]/site_config/.rietveld_secret_key"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "apply_issue",
     "~followup_annotations": [
       "@@@STEP_LINK@Applied issue 1@http://review_tool.url/1@@@"

recipe_modules/tryserver/example.expected/with_git_patch.json

@@ -9,7 +9,6 @@
       "--url",
       "http://patch.url/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "patch git setup"
   },
   {
@@ -56,7 +55,6 @@
       "--input",
       "[TMP_BASE]/patch_tmp_1/patch.diff"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "apply patch"
   },
   {
@@ -65,7 +63,6 @@
       "-rf",
       "[TMP_BASE]/patch_tmp_1"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "remove patch"
   },
   {
@@ -91,7 +88,6 @@
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "fail",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/tryserver/example.expected/with_rietveld_patch.json

@@ -14,7 +14,6 @@
       "https://codereview.chromium.org",
       "--no-auth"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "apply_issue",
     "~followup_annotations": [
       "@@@STEP_LINK@Applied issue 12853011@https://codereview.chromium.org/12853011@@@"
@@ -43,7 +42,6 @@
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "fail",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/tryserver/example.expected/with_svn_patch.json

@@ -7,7 +7,6 @@
       "svn://checkout.url",
       "/path/to/tmp/diff"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "download patch",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@patch.diff@fake patch.diff content (line 1)@@@",
@@ -27,7 +26,6 @@
       "--strip",
       "0"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "apply patch",
     "stdin": "fake patch.diff content (line 1)\nfake patch.diff content (line 2)\n"
   },
@@ -54,7 +52,6 @@
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "fail",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

recipe_modules/tryserver/example.expected/with_wrong_patch.json

@@ -27,7 +27,6 @@
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "fail",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",