Index: scripts/slave/recipes/v8/auto_roll_release_process.expected/update.json |
diff --git a/scripts/slave/recipes/v8/auto_roll_release_process.expected/update.json b/scripts/slave/recipes/v8/auto_roll_release_process.expected/update.json |
index 809aebabc30a1cd664e9e2d8e762167c51648a9d..a11e4e4f974fb3f46d1b3aed55d985a61d3bea5b 100644 |
--- a/scripts/slave/recipes/v8/auto_roll_release_process.expected/update.json |
+++ b/scripts/slave/recipes/v8/auto_roll_release_process.expected/update.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]", |
"--root", |
"v8", |
"--revision_mapping_file", |
"{\"v8\": \"got_revision\"}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -26,7 +26,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -62,11 +61,10 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/tools/runit.py", |
- "[BUILD]/scripts/tools/pycurl.py", |
+ "[ROOT]/b/build/scripts/tools/runit.py", |
+ "[ROOT]/b/build/scripts/tools/pycurl.py", |
"https://v8-status.appspot.com/lkgr" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "get new lkgr", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -81,7 +79,7 @@ |
"https://chromium.googlesource.com/v8/v8", |
"+refs/heads/lkgr:refs/heads/lkgr" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git fetch" |
}, |
{ |
@@ -91,7 +89,7 @@ |
"-s", |
"refs/heads/lkgr" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git show-ref refs/heads/lkgr", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -106,7 +104,7 @@ |
"refs/heads/lkgr", |
"c1a7fd0c98a80c52fcf6763850d2ee1c41cfe8d6" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git update-ref" |
}, |
{ |
@@ -116,7 +114,7 @@ |
"https://chromium.googlesource.com/v8/v8", |
"refs/heads/lkgr:refs/heads/lkgr" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git push" |
}, |
{ |
@@ -124,10 +122,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/refs_heads_lkgr.log", |
+ "[CWD]/refs_heads_lkgr.log", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Read refs_heads_lkgr.log" |
}, |
{ |
@@ -136,9 +133,8 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"\nc1a7fd0c98a80c52fcf6763850d2ee1c41cfe8d6 396004", |
- "[SLAVE_BUILD]/refs_heads_lkgr.log" |
+ "[CWD]/refs_heads_lkgr.log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Write refs_heads_lkgr.log" |
}, |
{ |
@@ -147,13 +143,12 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cp", |
- "[SLAVE_BUILD]/refs_heads_lkgr.log", |
+ "[CWD]/refs_heads_lkgr.log", |
"gs://chromium-v8-auto-roll/v8_release_process/refs_heads_lkgr.log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8-auto-roll/v8_release_process/refs_heads_lkgr.log@@@" |
@@ -166,7 +161,7 @@ |
"https://chromium.googlesource.com/v8/v8", |
"+refs/heads/candidate:refs/heads/candidate" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git fetch (2)" |
}, |
{ |
@@ -176,7 +171,7 @@ |
"-s", |
"refs/heads/candidate" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git show-ref refs/heads/candidate", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -191,7 +186,7 @@ |
"https://chromium.googlesource.com/v8/v8", |
"+refs/heads/roll:refs/heads/roll" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git fetch (3)" |
}, |
{ |
@@ -201,7 +196,7 @@ |
"-s", |
"refs/heads/roll" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git show-ref refs/heads/roll", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -214,23 +209,21 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/timestamp.txt", |
+ "[CWD]/timestamp.txt", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "check timestamp" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/release/check_clusterfuzz.py", |
+ "[CWD]/v8/tools/release/check_clusterfuzz.py", |
"--key-file", |
- "[SLAVE_BUILD]/.cf_key", |
+ "[CWD]/.cf_key", |
"--results-file", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "check clusterfuzz", |
"stderr": "/path/to/tmp/err", |
"stdout": "/path/to/tmp/out" |
@@ -240,7 +233,6 @@ |
"echo", |
"Current candidate is 10h old (limit: 8h)." |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "log" |
}, |
{ |
@@ -250,7 +242,7 @@ |
"refs/heads/candidate", |
"c1a7fd0c98a80c52fcf6763850d2ee1c41cfe8d6" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git update-ref (2)" |
}, |
{ |
@@ -260,7 +252,7 @@ |
"https://chromium.googlesource.com/v8/v8", |
"refs/heads/candidate:refs/heads/candidate" |
], |
- "cwd": "[SLAVE_BUILD]/v8", |
+ "cwd": "[CWD]/v8", |
"name": "git push (2)" |
}, |
{ |
@@ -269,9 +261,8 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"c1a7fd0c98a80c52fcf6763850d2ee1c41cfe8d6 396008", |
- "[SLAVE_BUILD]/refs_heads_candidate.log" |
+ "[CWD]/refs_heads_candidate.log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Write refs_heads_candidate.log" |
}, |
{ |
@@ -280,13 +271,12 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cp", |
- "[SLAVE_BUILD]/refs_heads_candidate.log", |
+ "[CWD]/refs_heads_candidate.log", |
"gs://chromium-v8-auto-roll/v8_release_process/refs_heads_candidate.log" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload (2)", |
"~followup_annotations": [ |
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8-auto-roll/v8_release_process/refs_heads_candidate.log@@@" |
@@ -298,9 +288,8 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"396010", |
- "[SLAVE_BUILD]/timestamp.txt" |
+ "[CWD]/timestamp.txt" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "update timestamp" |
}, |
{ |