Index: scripts/slave/recipe_modules/auto_bisect/example.expected/android_bisector.json |
diff --git a/scripts/slave/recipe_modules/auto_bisect/example.expected/android_bisector.json b/scripts/slave/recipe_modules/auto_bisect/example.expected/android_bisector.json |
index 8d71e5b47b30a32c49a7a811967b679992d4a3c5..7b1db193914f0978e3a90d9ef1a59353f98eba99 100644 |
--- a/scripts/slave/recipe_modules/auto_bisect/example.expected/android_bisector.json |
+++ b/scripts/slave/recipe_modules/auto_bisect/example.expected/android_bisector.json |
@@ -6,7 +6,7 @@ |
"refs/heads/master", |
"refs/remotes/origin/master" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "git update-ref" |
}, |
{ |
@@ -15,12 +15,11 @@ |
"checkout", |
"master" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "git checkout" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "config", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@Bisect job configuration@{@@@", |
@@ -46,7 +45,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Resolving reference range" |
}, |
{ |
@@ -60,7 +58,6 @@ |
"--attempts", |
"3" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Resolving reference range.crrev get commit hash for refs/heads/master@{#314017}", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -82,7 +79,6 @@ |
"--attempts", |
"3" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Resolving reference range.crrev get commit hash for refs/heads/master@{#314015}", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -102,7 +98,6 @@ |
"--commit", |
"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Resolving reference range.fetch file 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111:DEPS", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -122,7 +117,6 @@ |
"--commit", |
"a6298e4afedbf2cd461755ea6f45b0ad64222222" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Resolving reference range.fetch file a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -135,7 +129,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Expanding revision range" |
}, |
{ |
@@ -147,7 +140,6 @@ |
"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111", |
"https://chromium.googlesource.com/chromium/src" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Expanding revision range.for revisions a6298e4afedbf2cd461755ea6f45b0ad64222222:00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -167,12 +159,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil ls" |
}, |
{ |
@@ -193,7 +184,7 @@ |
"--diff", |
"/dev/null" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "Requesting build for a6298e4afedbf2cd461755ea6f45b0ad64222222 via git try." |
}, |
{ |
@@ -202,12 +193,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil ls (2)" |
}, |
{ |
@@ -228,7 +218,7 @@ |
"--diff", |
"/dev/null" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "Requesting build for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111 via git try." |
}, |
{ |
@@ -238,13 +228,12 @@ |
"--position", |
"a6298e4afedbf2cd461755ea6f45b0ad64222222" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "resolving hash a6298e4afedbf2cd461755ea6f45b0ad64222222", |
"stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe" |
}, |
{ |
@@ -253,12 +242,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe.gsutil ls", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -266,7 +254,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe.Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222", |
"trigger_specs": [ |
{ |
@@ -298,7 +285,6 @@ |
"-u", |
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe.sleeping", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -316,12 +302,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe.gsutil ls (2)", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -333,12 +318,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cat", |
"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@a6298e4afe.gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -352,13 +336,12 @@ |
"--position", |
"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "resolving hash 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111", |
"stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf" |
}, |
{ |
@@ -367,12 +350,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf.gsutil ls", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -380,7 +362,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf.Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111", |
"trigger_specs": [ |
{ |
@@ -412,7 +393,6 @@ |
"-u", |
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf.sleeping", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -430,12 +410,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf.gsutil ls (2)", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -447,12 +426,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cat", |
"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@00316c9ddf.gsutil Get test results for build 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -465,12 +443,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil ls (3)" |
}, |
{ |
@@ -491,7 +468,7 @@ |
"--diff", |
"/dev/null" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "Requesting build for dcdcdc0ff1122212323134879ddceeb1240b0988 via git try." |
}, |
{ |
@@ -501,13 +478,12 @@ |
"--position", |
"dcdcdc0ff1122212323134879ddceeb1240b0988" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "resolving hash dcdcdc0ff1122212323134879ddceeb1240b0988", |
"stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1" |
}, |
{ |
@@ -516,12 +492,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.gsutil ls", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -529,7 +504,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988", |
"trigger_specs": [ |
{ |
@@ -561,7 +535,6 @@ |
"-u", |
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.sleeping", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -579,12 +552,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.gsutil ls (2)", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@" |
@@ -596,12 +568,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cat", |
"gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.gsutil Get test results for build dcdcdc0ff1122212323134879ddceeb1240b0988", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -617,7 +588,6 @@ |
"[12, 13, 14, 15, 16]", |
"0.01" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -635,7 +605,6 @@ |
"[12, 13, 14, 15, 16]", |
"0.01" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference (2)", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -652,7 +621,7 @@ |
"--pretty=format:", |
"dcdcdc0ff1122212323134879ddceeb1240b0988" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Checking DEPS for dcdcdc0ff1122212323134879ddceeb1240b0988", |
"stdout": "/path/to/tmp/" |
}, |
@@ -665,7 +634,6 @@ |
"--commit", |
"a6298e4afedbf2cd461755ea6f45b0ad64222222" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "fetch file a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS", |
"stdout": "/path/to/tmp/" |
}, |
@@ -678,7 +646,6 @@ |
"--commit", |
"dcdcdc0ff1122212323134879ddceeb1240b0988" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "fetch file dcdcdc0ff1122212323134879ddceeb1240b0988:DEPS", |
"stdout": "/path/to/tmp/" |
}, |
@@ -691,7 +658,6 @@ |
"004", |
"https://chromium.googlesource.com/v8/v8.git" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Expanding revision range for revision 004 on depot v8", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |
@@ -717,7 +683,7 @@ |
"-w", |
"--stdin" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Hashing modified DEPS file with revision 002", |
"stdin": "vars={'v8_revision': '002'};deps = {'src/v8': 'v8.git@' + Var('v8_revision'),'src/third_party/WebKit': 'webkit.git@010'}", |
"stdout": "/path/to/tmp/" |
@@ -731,7 +697,7 @@ |
"--src-prefix=IAMSRC:", |
"--dst-prefix=IAMDST:" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Generating patch for a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS to 002", |
"stdout": "/path/to/tmp/" |
}, |
@@ -744,7 +710,7 @@ |
"-w", |
"--stdin" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Hashing modified DEPS file with revision 003", |
"stdin": "vars={'v8_revision': '003'};deps = {'src/v8': 'v8.git@' + Var('v8_revision'),'src/third_party/WebKit': 'webkit.git@010'}", |
"stdout": "/path/to/tmp/" |
@@ -758,13 +724,12 @@ |
"--src-prefix=IAMSRC:", |
"--dst-prefix=IAMDST:" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Generating patch for a6298e4afedbf2cd461755ea6f45b0ad64222222:DEPS to 003", |
"stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Wiggling revision chromium@a6298e4afe,v8@003" |
}, |
{ |
@@ -773,12 +738,11 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"ls", |
"gs://chrome-perf/android_perf_rel/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil ls (4)" |
}, |
{ |
@@ -787,9 +751,8 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"Dummy .diff contents 001 - 003\ndiff --git DEPS.sha DEPS.sha\nnew file mode 100644\n--- /dev/null\n+++ DEPS.sha\n@@ -0,0 +1 @@\n+51e7ed4b63ad81d8b499e42b888149349afaaca1\n", |
- "[TMP_BASE]/003-build.diff" |
+ "[TMP]/003-build.diff" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Saving diff patch for 003" |
}, |
{ |
@@ -808,9 +771,9 @@ |
"--svn_repo", |
"svn://svn.chromium.org/chrome-try/try-perf", |
"--diff", |
- "[TMP_BASE]/003-build.diff" |
+ "[TMP]/003-build.diff" |
], |
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1", |
+ "cwd": "[TMP]/fake_checkout_tmp_1", |
"name": "Requesting build for 003 via git try." |
}, |
{ |
@@ -818,9 +781,8 @@ |
"python", |
"-u", |
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n", |
- "[TMP_BASE]/003-build.diff" |
+ "[TMP]/003-build.diff" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleaning up patch", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -838,7 +800,6 @@ |
"003", |
"v8" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Reading culprit cl information.", |
"stdout": "/path/to/tmp/json", |
"~followup_annotations": [ |