Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json |
index 944dc43e19a972414d3e16311f00b5e7048e5bbd..8692a0d8c0cc57ce3bcfd7e387cdb789cc66718f 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json |
@@ -5,7 +5,6 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "taskkill" |
}, |
{ |
@@ -20,13 +19,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]", |
+ "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]\\b\\build\\slave\\cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -34,7 +33,6 @@ |
"--force", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -108,7 +106,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma" |
}, |
{ |
@@ -119,17 +116,16 @@ |
"--platform", |
"windows-amd64", |
"--dest-directory", |
- "[SLAVE_BUILD]\\cipd", |
+ "[CWD]\\cipd", |
"--json-output", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma.install cipd", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
@@ -137,10 +133,10 @@ |
}, |
{ |
"cmd": [ |
- "[SLAVE_BUILD]\\cipd\\cipd", |
+ "fake_slave_build/cipd", |
"ensure", |
"--root", |
- "[CACHE]\\cipd\\goma", |
+ "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma", |
"--list", |
"infra_internal/goma/client/windows-amd64 release", |
"--json-output", |
@@ -148,7 +144,6 @@ |
"--service-account-json", |
"C:\\creds\\service_accounts\\service-account-goma-client.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma.ensure_installed", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
@@ -170,11 +165,10 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -188,26 +182,24 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py", |
+ "[CWD]\\src\\tools\\mb\\mb.py", |
"gen", |
"-m", |
"chromium.perf", |
"-b", |
"Win x64 Builder", |
"--config-file", |
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl", |
+ "[CWD]\\src\\tools\\mb\\mb_config.pyl", |
"--goma-dir", |
- "[CACHE]\\cipd\\goma", |
+ "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma", |
"//out/Release_x64" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "generate_build_files" |
}, |
{ |
@@ -225,9 +217,9 @@ |
"--target", |
"Release_x64", |
"--src-dir", |
- "[SLAVE_BUILD]\\src", |
+ "[CWD]\\src", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]\\b\\build\\slave\\goma_cache", |
"--build-tool", |
"ninja", |
"--build-data-dir", |
@@ -241,14 +233,13 @@ |
"--mode", |
"official", |
"--goma-dir", |
- "[CACHE]\\cipd\\goma", |
+ "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma", |
"--goma-hermetic", |
"fallback", |
"--", |
"chrome", |
"chromium_builder_perf" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -278,12 +269,10 @@ |
"--build-properties", |
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win x64 Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "package build" |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger", |
"trigger_specs": [ |
{ |
@@ -310,7 +299,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (2)", |
"trigger_specs": [ |
{ |
@@ -337,7 +325,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (3)", |
"trigger_specs": [ |
{ |
@@ -364,7 +351,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (4)", |
"trigger_specs": [ |
{ |
@@ -391,7 +377,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (5)", |
"trigger_specs": [ |
{ |
@@ -418,7 +403,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (6)", |
"trigger_specs": [ |
{ |
@@ -445,7 +429,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (7)", |
"trigger_specs": [ |
{ |
@@ -472,7 +455,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (8)", |
"trigger_specs": [ |
{ |
@@ -499,7 +481,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (9)", |
"trigger_specs": [ |
{ |
@@ -526,7 +507,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (10)", |
"trigger_specs": [ |
{ |
@@ -553,7 +533,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (11)", |
"trigger_specs": [ |
{ |
@@ -580,7 +559,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (12)", |
"trigger_specs": [ |
{ |
@@ -607,7 +585,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (13)", |
"trigger_specs": [ |
{ |
@@ -634,7 +611,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (14)", |
"trigger_specs": [ |
{ |
@@ -661,7 +637,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (15)", |
"trigger_specs": [ |
{ |
@@ -688,7 +663,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (16)", |
"trigger_specs": [ |
{ |
@@ -715,7 +689,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (17)", |
"trigger_specs": [ |
{ |
@@ -742,7 +715,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (18)", |
"trigger_specs": [ |
{ |
@@ -769,7 +741,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (19)", |
"trigger_specs": [ |
{ |
@@ -796,7 +767,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (20)", |
"trigger_specs": [ |
{ |
@@ -823,7 +793,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (21)", |
"trigger_specs": [ |
{ |
@@ -850,7 +819,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (22)", |
"trigger_specs": [ |
{ |
@@ -877,7 +845,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (23)", |
"trigger_specs": [ |
{ |
@@ -904,7 +871,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (24)", |
"trigger_specs": [ |
{ |
@@ -931,7 +897,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (25)", |
"trigger_specs": [ |
{ |
@@ -958,7 +923,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (26)", |
"trigger_specs": [ |
{ |
@@ -985,7 +949,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (27)", |
"trigger_specs": [ |
{ |
@@ -1012,7 +975,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (28)", |
"trigger_specs": [ |
{ |
@@ -1039,7 +1001,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (29)", |
"trigger_specs": [ |
{ |
@@ -1066,7 +1027,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (30)", |
"trigger_specs": [ |
{ |
@@ -1093,7 +1053,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (31)", |
"trigger_specs": [ |
{ |
@@ -1120,7 +1079,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (32)", |
"trigger_specs": [ |
{ |
@@ -1147,7 +1105,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (33)", |
"trigger_specs": [ |
{ |
@@ -1174,7 +1131,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (34)", |
"trigger_specs": [ |
{ |
@@ -1201,7 +1157,6 @@ |
}, |
{ |
"cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
"name": "trigger (35)", |
"trigger_specs": [ |
{ |
@@ -1250,7 +1205,6 @@ |
"--platform", |
"win" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "sizes" |
}, |
{ |
@@ -1261,7 +1215,6 @@ |
"--target", |
"Release_x64" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "process_dumps" |
}, |
{ |