Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_fyi_perf_bisect.json |
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_fyi_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_fyi_perf_bisect.json |
index 8fc47ddd155437902753551fb8aaf40892596edc..8769f3113048f7bc666032d8a1a18c55ebd81e3a 100644 |
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_fyi_perf_bisect.json |
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_fyi_perf_bisect.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
"--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", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--issue", |
"12853011", |
"--patchset", |
@@ -30,6 +30,7 @@ |
"src@HEAD", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -106,11 +107,12 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[CWD]/src/out/Release/debug_info_dumps", |
- "[CWD]/src/out/Release/test_logs", |
- "[CWD]/src/out/build_product.zip", |
- "[CWD]/src" |
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
+ "[SLAVE_BUILD]/src/out/Release/test_logs", |
+ "[SLAVE_BUILD]/src/out/build_product.zip", |
+ "[SLAVE_BUILD]/src" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "clean local files", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -135,7 +137,7 @@ |
"--cached", |
"--name-only" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "git diff to analyze patch", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -147,23 +149,25 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/symlink.py", |
+ "[SLAVE_BUILD]/src/build/symlink.py", |
"-f", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
"~/adb" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "create adb symlink" |
}, |
{ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", |
"--", |
- "[CWD]/src/build/android/adb_logcat_monitor.py", |
- "[CWD]/src/out/logcat" |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", |
+ "[SLAVE_BUILD]/src/out/logcat" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "spawn_logcat_monitor" |
}, |
@@ -174,27 +178,29 @@ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py", |
"--verbose", |
"--adb-path", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb" |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "authorize_adb_devices" |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/buildbot/bb_device_status_check.py", |
+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", |
"--json-output", |
"/path/to/tmp/json", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--known-devices-file", |
- "[ROOT]/b/build/site_config/.known_devices" |
+ "[BUILD]/site_config/.known_devices" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "device_status_check", |
"~followup_annotations": [ |
@@ -296,11 +302,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/android/provision_devices.py", |
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py", |
"-t", |
"Release", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--output-device-blacklist", |
"/path/to/tmp/json", |
"--min-battery-level", |
@@ -311,9 +317,10 @@ |
"350", |
"--remove-system-webview" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "provision_devices" |
}, |
@@ -328,13 +335,14 @@ |
"/tmp/device_monitor.pid", |
"--", |
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
"[\"07a00ca4\"]", |
"tryserver.chromium.perf", |
"android_fyi_perf_bisect", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json" |
+ "[SLAVE_BUILD]/src/out/bad_devices.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "spawn_device_monitor" |
}, |
{ |
@@ -344,12 +352,13 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
}, |
@@ -359,10 +368,11 @@ |
"-u", |
"RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py", |
"--source", |
- "[CWD]/src/tools/run-perf-test.cfg", |
+ "[SLAVE_BUILD]/src/tools/run-perf-test.cfg", |
"--output_json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "load config", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -388,7 +398,7 @@ |
"-1", |
"origin/master" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "resolving commit_pos 306476", |
"stdout": "/path/to/tmp/" |
}, |
@@ -402,7 +412,7 @@ |
"-1", |
"origin/master" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "resolving commit_pos 306475", |
"stdout": "/path/to/tmp/" |
}, |
@@ -418,13 +428,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
"--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", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--rietveld_server", |
"https://codereview.chromium.org", |
"--output_json", |
@@ -434,6 +444,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -500,12 +511,13 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks on bad49c331def2a3bbf3ddd0096eb51551155" |
}, |
@@ -514,11 +526,12 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[CWD]/src/out/Release/debug_info_dumps", |
- "[CWD]/src/out/Release/test_logs", |
- "[CWD]/src/out/build_product.zip", |
- "[CWD]/src" |
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
+ "[SLAVE_BUILD]/src/out/Release/test_logs", |
+ "[SLAVE_BUILD]/src/out/build_product.zip", |
+ "[SLAVE_BUILD]/src" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "clean local files (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -540,18 +553,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/tools/mb/mb.py", |
+ "[SLAVE_BUILD]/src/tools/mb/mb.py", |
"gen", |
"-m", |
"tryserver.chromium.perf", |
"-b", |
"android_fyi_perf_bisect", |
"--config-file", |
- "[CWD]/src/tools/mb/mb_config.pyl", |
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "generate_build_files bad49c331def2a3bbf3ddd0096eb51551155" |
}, |
{ |
@@ -569,9 +583,9 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -581,14 +595,15 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"--goma-fail-fast", |
"--goma-disable-local-fallback", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "compile bad49c331def2a3bbf3ddd0096eb51551155", |
"~followup_annotations": [ |
@@ -598,16 +613,17 @@ |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/adb_install_apk.py", |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
"ChromePublic.apk", |
"-v", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "install ChromePublic.apk" |
}, |
@@ -630,7 +646,7 @@ |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--run-python-script", |
- "[CWD]/src/tools/perf/run_benchmark", |
+ "[SLAVE_BUILD]/src/tools/perf/run_benchmark", |
"-v", |
"--browser=android-chrome", |
"sunspider", |
@@ -638,8 +654,9 @@ |
"--upload-results", |
"--results-label=bad49c331def2a3bbf3ddd0096eb51551155" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release" |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release" |
}, |
"name": "Performance Test (bad49c331def2a3bbf3ddd0096eb51551155) 1 of 1", |
"stderr": "/path/to/tmp/", |
@@ -667,13 +684,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, '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/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': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
"--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", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--rietveld_server", |
"https://codereview.chromium.org", |
"--output_json", |
@@ -683,6 +700,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -749,12 +767,13 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks on d49c331def2a3bbf3ddd0096eb51551155" |
}, |
@@ -763,11 +782,12 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[CWD]/src/out/Release/debug_info_dumps", |
- "[CWD]/src/out/Release/test_logs", |
- "[CWD]/src/out/build_product.zip", |
- "[CWD]/src" |
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
+ "[SLAVE_BUILD]/src/out/Release/test_logs", |
+ "[SLAVE_BUILD]/src/out/build_product.zip", |
+ "[SLAVE_BUILD]/src" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "clean local files (3)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -789,18 +809,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/tools/mb/mb.py", |
+ "[SLAVE_BUILD]/src/tools/mb/mb.py", |
"gen", |
"-m", |
"tryserver.chromium.perf", |
"-b", |
"android_fyi_perf_bisect", |
"--config-file", |
- "[CWD]/src/tools/mb/mb_config.pyl", |
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "generate_build_files d49c331def2a3bbf3ddd0096eb51551155" |
}, |
{ |
@@ -818,9 +839,9 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -830,14 +851,15 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"--goma-fail-fast", |
"--goma-disable-local-fallback", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "compile d49c331def2a3bbf3ddd0096eb51551155", |
"~followup_annotations": [ |
@@ -847,16 +869,17 @@ |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/adb_install_apk.py", |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
"ChromePublic.apk", |
"-v", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--release" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "install ChromePublic.apk (2)" |
}, |
@@ -879,15 +902,16 @@ |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--run-python-script", |
- "[CWD]/src/tools/perf/run_benchmark", |
+ "[SLAVE_BUILD]/src/tools/perf/run_benchmark", |
"-v", |
"--browser=android-chrome", |
"sunspider", |
"--upload-results", |
"--results-label=d49c331def2a3bbf3ddd0096eb51551155" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release" |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release" |
}, |
"name": "Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1", |
"stderr": "/path/to/tmp/", |
@@ -905,6 +929,7 @@ |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Results", |
"~followup_annotations": [ |
"@@@STEP_TEXT@", |
@@ -926,6 +951,7 @@ |
"-u", |
"RECIPE_MODULE[build::perf_dashboard]/resources/post_json.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Post bisect results", |
"stdin": "{\"data\": {\"bisect_bot\": \"android_fyi_perf_bisect\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/android_fyi_perf_bisect/builds/571\", \"change\": 0.0, \"cloud_link\": \"http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chrome sunspider\", \"metric\": \"dummy/dummy\", \"profiler_links\": [], \"result\": \"Revision Mean Std.Error\\nPatch 5.805333333330.127614436662\\nNo Patch 5.805333333330.127614436662\", \"status\": \"completed\", \"std_err\": 0.1804740670813644, \"try_job_id\": null}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}", |
"stdout": "/path/to/tmp/json", |
@@ -946,17 +972,19 @@ |
"--pid-file-path", |
"/tmp/device_monitor.pid" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "shutdown_device_monitor" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/android/adb_logcat_printer.py", |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", |
"--output-path", |
- "[CWD]/src/out/Release/full_log", |
- "[CWD]/src/out/logcat" |
+ "[SLAVE_BUILD]/src/out/Release/full_log", |
+ "[SLAVE_BUILD]/src/out/logcat" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "logcat_dump" |
}, |
{ |
@@ -965,7 +993,7 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[ROOT]/b/depot_tools/gsutil.py", |
+ "[DEPOT_TOOLS]/gsutil.py", |
"--force-version", |
"4.7", |
"-o", |
@@ -974,9 +1002,10 @@ |
"cp", |
"-a", |
"public-read", |
- "[CWD]/src/out/Release/full_log", |
+ "[SLAVE_BUILD]/src/out/Release/full_log", |
"gs://chromium-android/logcat_dumps/android_fyi_perf_bisect/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_fyi_perf_bisect/571@@@" |
@@ -984,30 +1013,32 @@ |
}, |
{ |
"cmd": [ |
- "[CWD]/src/third_party/android_platform/development/scripts/stack", |
+ "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack", |
"--arch", |
"arm", |
"--more-info", |
- "[CWD]/src/out/Release/full_log" |
+ "[SLAVE_BUILD]/src/out/Release/full_log" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "stack_tool_with_logcat_dump" |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/tombstones.py", |
+ "[SLAVE_BUILD]/src/build/android/tombstones.py", |
"-a", |
"-s", |
"-w" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release", |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "stack_tool_for_tombstones" |
}, |
@@ -1016,8 +1047,9 @@ |
"python", |
"-u", |
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n", |
- "[CWD]/src/out/Release/test_logs/*.log" |
+ "[SLAVE_BUILD]/src/out/Release/test_logs/*.log" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "test_report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |