Skip to content

C
Chromium_Depot_tools
Commit 3407a996 authored by martiniss@chromium.org's avatar martiniss@chromium.org
Browse files
Options

Roll recipe_engine to 2f86f02a302172514bf282684e0a4aa18b683e41 

TBR=phajdan.jr

BUG=606708

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300206 0039d316-1c4b-4281-b951-d872f2087c98
parent d34c9060
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 8 deletions
infra/config/recipes.cfg
View file @ 3407a996
......@@ -5,5 +5,5 @@ deps {
project_id: "recipe_engine"
url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
branch: "master"
revision: "f712a9271eb999e8b43c48ea9404f4bef393e486"
revision: "2f86f02a302172514bf282684e0a4aa18b683e41"
}
recipe_modules/bot_update/example.expected/basic.json
View file @ 3407a996
......@@ -23,6 +23,7 @@
"--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
View file @ 3407a996
......@@ -24,6 +24,7 @@
"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
View file @ 3407a996
......@@ -24,6 +24,7 @@
"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
View file @ 3407a996
......@@ -24,6 +24,7 @@
"src@HEAD",
"--clobber"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/forced.json
View file @ 3407a996
......@@ -24,6 +24,7 @@
"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
View file @ 3407a996
......@@ -24,6 +24,7 @@
"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
View file @ 3407a996
......@@ -24,6 +24,7 @@
"src@HEAD",
"--no_shallow"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/off.json
View file @ 3407a996
......@@ -23,6 +23,7 @@
"--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
View file @ 3407a996
......@@ -23,6 +23,7 @@
"--revision",
"src@revision"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/svn_mode.json
View file @ 3407a996
......@@ -24,6 +24,7 @@
"src@HEAD",
"--force"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/trychange.json
View file @ 3407a996
......@@ -25,6 +25,7 @@
"--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
View file @ 3407a996
......@@ -27,6 +27,7 @@
"--revision",
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/tryjob.json
View file @ 3407a996
......@@ -25,6 +25,7 @@
"--revision",
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/tryjob_fail.json
View file @ 3407a996
......@@ -25,6 +25,7 @@
"--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
View file @ 3407a996
......@@ -25,6 +25,7 @@
"--revision",
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -66,6 +67,7 @@
"-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
View file @ 3407a996
......@@ -25,6 +25,7 @@
"--revision",
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -65,6 +66,7 @@
"-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
View file @ 3407a996
......@@ -29,6 +29,7 @@
"--revision",
"src/third_party/angle@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/bot_update/example.expected/tryjob_v8.json
View file @ 3407a996
......@@ -27,6 +27,7 @@
"--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
View file @ 3407a996
......@@ -31,6 +31,7 @@
"--revision",
"src/v8@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......
recipe_modules/gclient/example.expected/basic.json
View file @ 3407a996
......@@ -8,6 +8,7 @@
"--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]"
},
......@@ -31,6 +32,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -57,6 +59,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -73,6 +76,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -136,6 +140,7 @@
"\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",
"[CWD]"
],
"cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
......@@ -159,6 +164,7 @@
"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
View file @ 3407a996
......@@ -8,6 +8,7 @@
"--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]"
},
......@@ -33,6 +34,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -59,6 +61,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -75,6 +78,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -138,6 +142,7 @@
"\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",
"[CWD]"
],
"cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
......@@ -161,6 +166,7 @@
"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
View file @ 3407a996
......@@ -8,6 +8,7 @@
"--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]"
},
......@@ -33,6 +34,7 @@
"--output-json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -59,6 +61,7 @@
"user.name",
"local_bot"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -75,6 +78,7 @@
"user.email",
"local_bot@example.com"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
......@@ -149,6 +153,7 @@
"\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",
"[CWD]"
],
"cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
......@@ -172,6 +177,7 @@
"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
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/basic_branch.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/basic_file_name.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/basic_hash.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/basic_ref.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/basic_submodule_update_force.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/can_fail_build.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/cannot_fail_build.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/cat-file_test.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/count-objects_delta.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/count-objects_failed.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--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
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--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
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/curl_trace_file.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/platform_win.json
View file @ 3407a996
......@@ -18,6 +18,7 @@
"--git_cmd_path",
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/rebase_failed.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/remote_not_origin.json
View file @ 3407a996
......@@ -11,6 +11,7 @@
"--remote",
"not_origin"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/git/example.expected/set_got_revision.json
View file @ 3407a996
......@@ -9,6 +9,7 @@
"--url",
"https://chromium.googlesource.com/chromium/src.git"
],
"cwd": "[SLAVE_BUILD]",
"name": "git setup"
},
{
......
recipe_modules/infra_paths/test_api.py
View file @ 3407a996
......@@ -5,7 +5,7 @@
from recipe_engine import recipe_test_api
from recipe_engine.config_types import Path, NamedBasePath
class InfraPathsTestApi(recipe_test_api.RecipeTestApi):
class InfraPathsTestApi(recipe_test_api.RecipeTestApi): #pragma: no cover
@recipe_test_api.mod_test_data
@staticmethod
def exists(*paths):
......
recipe_modules/presubmit/example.expected/basic.json
View file @ 3407a996
......@@ -5,6 +5,7 @@
"-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
View file @ 3407a996
......@@ -17,6 +17,7 @@
"-k",
"[ROOT]/b/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
View file @ 3407a996
......@@ -5,10 +5,11 @@
"-u",
"[ROOT]/b/build/scripts/slave/git_setup.py",
"--path",
"[TMP]/patch_tmp_1",
"[TMP_BASE]/patch_tmp_1",
"--url",
"http://patch.url/"
],
"cwd": "[SLAVE_BUILD]",
"name": "patch git setup"
},
{
......@@ -18,7 +19,7 @@
"origin",
"johndoe#123.diff"
],
"cwd": "[TMP]/patch_tmp_1",
"cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch fetch"
},
{
......@@ -29,7 +30,7 @@
"-d",
"-x"
],
"cwd": "[TMP]/patch_tmp_1",
"cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch clean"
},
{
......@@ -39,7 +40,7 @@
"-f",
"FETCH_HEAD"
],
"cwd": "[TMP]/patch_tmp_1",
"cwd": "[TMP_BASE]/patch_tmp_1",
"name": "patch git checkout"
},
{
......@@ -53,16 +54,18 @@
"--strip",
"0",
"--input",
"[TMP]/patch_tmp_1/patch.diff"
"[TMP_BASE]/patch_tmp_1/patch.diff"
],
"cwd": "[SLAVE_BUILD]",
"name": "apply patch"
},
{
"cmd": [
"rm",
"-rf",
"[TMP]/patch_tmp_1"
"[TMP_BASE]/patch_tmp_1"
],
"cwd": "[SLAVE_BUILD]",
"name": "remove patch"
},
{
......@@ -88,6 +91,7 @@
"-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
View file @ 3407a996
......@@ -14,6 +14,7 @@
"https://codereview.chromium.org",
"--no-auth"
],
"cwd": "[SLAVE_BUILD]",
"name": "apply_issue",
"~followup_annotations": [
"@@@STEP_LINK@Applied issue 12853011@https://codereview.chromium.org/12853011@@@"
......@@ -42,6 +43,7 @@
"-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
View file @ 3407a996
......@@ -7,6 +7,7 @@
"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)@@@",
......@@ -26,6 +27,7 @@
"--strip",
"0"
],
"cwd": "[SLAVE_BUILD]",
"name": "apply patch",
"stdin": "fake patch.diff content (line 1)\nfake patch.diff content (line 2)\n"
},
......@@ -52,6 +54,7 @@
"-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
View file @ 3407a996
......@@ -27,6 +27,7 @@
"-u",
"import sys; sys.exit(1)"
],
"cwd": "[SLAVE_BUILD]",
"name": "fail",
"~followup_annotations": [
"step returned non-zero exit code: 1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment