scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json - Issue 2228473002: bisection: prepare for running under remote_run

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json

Issue 2228473002: bisection: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« scripts/slave/recipe_modules/auto_bisect/api.py ('K') | « scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_android_webview_arm64_aosp_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_nexus5X_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json

diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json

index 790bcd4f39322d69da7749ee9c616209a02bc2a2..bce30298d3e034954de8ce32c91c5431b8849433 100644

--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json

+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_metric_android_fyi_perf_bisect.json

@@ -3,6 +3,28 @@

"cmd": [

"python",

"-u",

+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect",

+ "511"

+ ],

+ "name": "makedirs checkout path",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

+ "@@@STEP_LOG_END@python.inline@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",

"--master",

"tryserver.chromium.perf",

@@ -30,6 +52,7 @@

"src@HEAD",

"--output_manifest"

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -114,10 +137,10 @@

"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",

- "[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"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/debug_info_dumps",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/test_logs",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src"

"name": "clean local files",

"~followup_annotations": [

@@ -143,7 +166,7 @@

"--cached",

"--name-only"

- "cwd": "[SLAVE_BUILD]/src",

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect/src",

"name": "git diff to analyze patch",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -155,9 +178,9 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/build/symlink.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/symlink.py",

"-f",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"~/adb"

"name": "create adb symlink"

@@ -166,13 +189,13 @@

"cmd": [

"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",

"--",

- "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",

- "[SLAVE_BUILD]/src/out/logcat",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/adb_logcat_monitor.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/logcat",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "spawn_logcat_monitor"

@@ -183,28 +206,28 @@

"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",

"--verbose",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "authorize_adb_devices"

{

"cmd": [

- "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json",

"--known-devices-file",

"[HOME]/.android/known_devices.json",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"-v"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "device_recovery"

@@ -212,11 +235,11 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/build/android/provision_devices.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/provision_devices.py",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json",

"--output-device-blacklist",

"/path/to/tmp/json",

"-t",

@@ -231,29 +254,29 @@

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "provision_devices"

{

"cmd": [

- "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_status.py",

"--json-output",

"/path/to/tmp/json",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json",

"--known-devices-file",

"[HOME]/.android/known_devices.json",

"--buildbot-path",

"/home/chrome-bot/.adb_device_info",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"-v",

"--overwrite-known-devices-files"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "device_status",

"~followup_annotations": [

@@ -362,10 +385,10 @@

"/tmp/device_monitor.pid",

"--",

"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"[\"07a00ca4\"]",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json"

"name": "spawn_device_monitor"

@@ -376,13 +399,13 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

- "cwd": "[SLAVE_BUILD]/src",

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect/src",

"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='[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]"

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='RECIPE_PACKAGE_REPO[build]/goma' target_arch=arm use_goma=1",

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks"

@@ -396,7 +419,7 @@

"-u",

"RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py",

"--source",

- "[SLAVE_BUILD]/src/tools/run-perf-test.cfg",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/tools/run-perf-test.cfg",

"--output_json",

"/path/to/tmp/json"

@@ -419,10 +442,10 @@

"python",

"-u",

- "[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"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/debug_info_dumps",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/test_logs",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src"

"name": "clean local files (2)",

"~followup_annotations": [

@@ -508,7 +531,7 @@

"python",

"-u",

"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",

- "[SLAVE_BUILD]/src/out/Release"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release"

"name": "rmtree build directory",

"~followup_annotations": [

@@ -534,7 +557,7 @@

"----",

"cp",

"gs://chrome-perf-tryjob/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9_123456.zip",

- "[SLAVE_BUILD]/src/out/build_product.zip"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip"

"name": "gsutil download_build_product"

@@ -542,9 +565,9 @@

"cmd": [

"unzip",

"-o",

- "[SLAVE_BUILD]/src/out/build_product.zip"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip"

- "cwd": "[SLAVE_BUILD]/src",

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect/src",

"name": "unzip_build_product"

{

@@ -552,25 +575,25 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]/src/chrome/VERSION",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/chrome/VERSION",

"/path/to/tmp/"

"name": "get version"

{

"cmd": [

- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/adb_install_apk.py",

"ChromePublic.apk",

"-v",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"--release"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "install ChromePublic.apk"

@@ -585,15 +608,15 @@

"android",

"--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_fyi_perf_bisect\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_fyi_perf_bisect\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"--step-name=Performance Test (With Patch) 1 of 1",

"--builder-name=android_fyi_perf_bisect",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/tools/perf/run_benchmark",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/tools/perf/run_benchmark",

"-v",

"--browser=android-chrome",

"sunspider",

@@ -602,7 +625,7 @@

"--results-label=Patch"

"env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"

+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release"

"name": "Performance Test (With Patch) 1 of 1",

"stderr": "/path/to/tmp/",

@@ -718,13 +741,13 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

- "cwd": "[SLAVE_BUILD]/src",

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect/src",

"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='[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]"

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='RECIPE_PACKAGE_REPO[build]/goma' target_arch=arm use_goma=1",

"name": "gclient runhooks (without patch)"

@@ -750,10 +773,10 @@

"python",

"-u",

- "[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"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/debug_info_dumps",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/test_logs",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src"

"name": "clean local files (3)",

"~followup_annotations": [

@@ -839,7 +862,7 @@

"python",

"-u",

"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",

- "[SLAVE_BUILD]/src/out/Release"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release"

"name": "rmtree build directory (2)",

"~followup_annotations": [

@@ -865,7 +888,7 @@

"----",

"cp",

"gs://chrome-perf/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9.zip",

- "[SLAVE_BUILD]/src/out/build_product.zip"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip"

"name": "gsutil download_build_product (2)"

@@ -873,9 +896,9 @@

"cmd": [

"unzip",

"-o",

- "[SLAVE_BUILD]/src/out/build_product.zip"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/build_product.zip"

- "cwd": "[SLAVE_BUILD]/src",

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect/src",

"name": "unzip_build_product (2)"

{

@@ -883,25 +906,25 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]/src/chrome/VERSION",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/chrome/VERSION",

"/path/to/tmp/"

"name": "get version (2)"

{

"cmd": [

- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/adb_install_apk.py",

"ChromePublic.apk",

"-v",

"--blacklist-file",

- "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/bad_devices.json",

"--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",

"--release"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "install ChromePublic.apk (2)"

@@ -916,15 +939,15 @@

"android",

"--xvfb",

"--factory-properties",

"--build-properties",

"--step-name=Performance Test (Without Patch) 1 of 1",

"--builder-name=android_fyi_perf_bisect",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/tools/perf/run_benchmark",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/tools/perf/run_benchmark",

"-v",

"--browser=android-chrome",

"sunspider",

@@ -932,7 +955,7 @@

"--results-label=TOT"

"env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"

+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release"

"name": "Performance Test (Without Patch) 1 of 1",

"stderr": "/path/to/tmp/",

@@ -987,6 +1010,28 @@

"cmd": [

"python",

"-u",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect",

+ "511"

+ ],

+ "name": "makedirs checkout path (2)",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

+ "@@@STEP_LOG_END@python.inline@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",

"--master",

"tryserver.chromium.perf",

@@ -1014,6 +1059,7 @@

"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

"--output_manifest"

+ "cwd": "[BUILDER_CACHE]/android_fyi_perf_bisect",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -1109,10 +1155,10 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/adb_logcat_printer.py",

"--output-path",

- "[SLAVE_BUILD]/src/out/Release/full_log",

- "[SLAVE_BUILD]/src/out/logcat"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/full_log",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/logcat"

"name": "logcat_dump"

@@ -1131,7 +1177,7 @@

"cp",

"-a",

"public-read",

- "[SLAVE_BUILD]/src/out/Release/full_log",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/full_log",

"gs://chromium-android/logcat_dumps/android_fyi_perf_bisect/571"

"name": "gsutil upload",

@@ -1141,16 +1187,16 @@

{

"cmd": [

- "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_platform/development/scripts/stack",

"--arch",

"arm",

"--more-info",

- "[SLAVE_BUILD]/src/out/Release/full_log"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/full_log"

"env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release",

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "stack_tool_with_logcat_dump"

@@ -1159,22 +1205,22 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]/src/chrome/VERSION",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/chrome/VERSION",

"/path/to/tmp/"

"name": "get version (3)"

{

"cmd": [

- "[SLAVE_BUILD]/src/build/android/tombstones.py",

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android/tombstones.py",

"-a",

"-s",

"-w"

"env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release",

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/android_fyi_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_fyi_perf_bisect/src/build/android:%(PATH)s"

"name": "stack_tool_for_tombstones"

@@ -1183,7 +1229,7 @@

"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",

- "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"

+ "[BUILDER_CACHE]/android_fyi_perf_bisect/src/out/Release/test_logs/*.log"

"name": "test_report",

"~followup_annotations": [