scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json - Issue 2445193002: Change all remote run builders to use tools/build.

Unified Diff: scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json

Issue 2445193002: Change all remote run builders to use tools/build. (Closed)

Patch Set: Add recipes Created 4 years, 2 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

« no previous file with comments | « scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__2_.json ('k') | scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json

diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_lollipop_builder.json b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json

similarity index 66%

copy from scripts/slave/recipes/cronet.expected/android_cronet_lollipop_builder.json

copy to scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json

index 9d07022d2a60c5e6d211a7a45166dd9b6abfe026..14004dab67d1383919125819bdfa7480479385a4 100644

--- a/scripts/slave/recipes/cronet.expected/android_cronet_lollipop_builder.json

+++ b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json

@@ -3,42 +3,19 @@

"cmd": [

"python",

"-u",

- "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",

- "[SLAVE_BUILD]"

- ],

- "name": "cleanup index.lock",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

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

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",

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

- "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",

- "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",

- "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",

- "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",

- "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",

- "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

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

"--spec",

- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']",

+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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.git', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]\ntarget_os = ['android']",

"--patch_root",

"src",

"--revision_mapping_file",

- "{\"src\": \"got_src_revision\", \"src/buildtools\": \"got_buildtools_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\"}",

+ "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",

"--output_json",

"/path/to/tmp/json",

"--revision",

- "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",

+ "src@deadbeef",

"--output_manifest"

"env": {

@@ -50,7 +27,7 @@

"@@@STEP_LOG_LINE@json.output@{@@@",

"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",

"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"src\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"deadbeef\"@@@",

"@@@STEP_LOG_LINE@json.output@ }, @@@",

"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",

@@ -91,8 +68,8 @@

"@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"got_src_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"got_src_revision_cp\": \"refs/heads/master@{#170242}\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",

@@ -105,17 +82,17 @@

"@@@STEP_LOG_LINE@json.output@}@@@",

"@@@STEP_LOG_END@json.output@@@",

"@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",

- "@@@SET_BUILD_PROPERTY@got_src_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",

+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",

"@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",

"@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",

- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",

+ "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",

"@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",

"@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",

"@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",

"@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",

"@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",

"@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",

- "@@@SET_BUILD_PROPERTY@got_src_revision_cp@\"refs/heads/master@{#170242}\"@@@",

+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",

"@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",

"@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"

]

@@ -124,6 +101,42 @@

"cmd": [

"python",

"-u",

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

+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json",

+ "/path/to/tmp/json"

+ ],

+ "name": "read test spec (chromium.perf.json)",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json@@@",

+ "@@@STEP_LOG_LINE@json.output@{}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",

+ "--output",

+ "/path/to/tmp/json",

+ "--",

+ "--build-config-fs",

+ "Release",

+ "--paths",

+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

+ "--properties",

+ "{\"buildername\": \"Android One Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-one\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}"

+ ],

+ "name": "get compile targets for scripts",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@{}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

+ "cmd": [

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

@@ -148,79 +161,20 @@

]

{

- "cmd": [],

- "name": "ensure_goma"

- },

- {

- "cmd": [

- "python",

- "-u",

- "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",

- "--platform",

- "linux-amd64",

- "--dest-directory",

- "[SLAVE_BUILD]/cipd",

- "--json-output",

- "/path/to/tmp/json"

- ],

- "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@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",

- "@@@STEP_LOG_LINE@json.output@}@@@",

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "cmd": [

- "[SLAVE_BUILD]/cipd/cipd",

- "ensure",

- "--root",

- "[CACHE]/cipd/goma",

- "--list",

- "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",

- "--json-output",

- "/path/to/tmp/json",

- "--service-account-json",

- "/creds/service_accounts/service-account-goma-client.json"

- ],

- "name": "ensure_goma.ensure_installed",

- "~followup_annotations": [

- "@@@STEP_NEST_LEVEL@1@@@",

- "@@@STEP_LOG_LINE@json.output@{@@@",

- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",

- "@@@STEP_LOG_LINE@json.output@ {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",

- "@@@STEP_LOG_LINE@json.output@ }@@@",

- "@@@STEP_LOG_LINE@json.output@ ]@@@",

- "@@@STEP_LOG_LINE@json.output@}@@@",

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

"cmd": [

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

+ "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",

+ "[SLAVE_BUILD]/src/third_party/catapult/devil"

- "name": "rmtree clobber",

+ "name": "initialize devil",

"~followup_annotations": [

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

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

- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",

- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",

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

+ "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",

+ "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",

+ "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",

+ "@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",

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

]

@@ -228,280 +182,26 @@

"cmd": [

"python",

"-u",

- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

- "runhooks"

- ],

- "cwd": "[SLAVE_BUILD]/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 disable_brotli_filter=1 disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1 use_platform_icu_alternatives=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"

- },

- {

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/src/tools/mb/mb.py",

- "gen",

- "-m",

- "chromium.testing.master",

- "-b",

- "Android Cronet Lollipop Builder",

- "--config-file",

- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

- "--goma-dir",

- "[CACHE]/cipd/goma",

- "//out/Release"

- ],

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

- "env": {

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

- },

- "name": "generate_build_files"

- },

- {

- "cmd": [

- "python",

- "-u",

- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

- "--show-path",

- "python",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",

- "--gsutil-py-path",

- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

- "--ninja-path",

- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",

- "--target",

- "Release",

- "--src-dir",

- "[SLAVE_BUILD]/src",

- "--goma-cache-dir",

- "[GOMA_CACHE]",

- "--buildbot-buildername",

- "Android Cronet Lollipop Builder",

- "--buildbot-mastername",

- "chromium.testing.master",

- "--buildbot-slavename",

- "TestSlavename",

- "--goma-deps-cache-file",

- "Android_Cronet_Lollipop_Builder.gomadeps",

- "--compiler",

- "goma",

- "--goma-jsonstatus",

- "/path/to/tmp/json",

- "--goma-service-account-json-file",

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

- "--goma-dir",

- "[CACHE]/cipd/goma",

+ "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

"--",

- "cronet_package",

- "cronet_perf_test_apk",

- "cronet_sample_test_apk",

- "cronet_test_instrumentation_apk",

- "cronet_unittests",

- "cronet_unittests_apk",

- "net_unittests",

- "net_unittests_apk"

- ],

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

- },

- "name": "compile",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",

- "@@@STEP_LOG_END@json.output (invalid)@@@"

- ]

- },

- {

- "allow_subannotations": true,

- "cmd": [

- "python",

- "-u",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

- "--target",

- "Release",

- "--no-xvfb",

- "--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Lollipop Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

- "--build-properties",

- "--test-type=sizes",

- "--builder-name=Android Cronet Lollipop Builder",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--run-python-script",

- "--annotate=graphing",

- "--results-url=https://chromeperf.appspot.com",

- "--perf-dashboard-id=sizes",

- "--perf-id=android_cronet_l_builder",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/sizes.py",

- "--target",

- "Release",

- "--platform",

- "android-cronet"

+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

+ "--force-version",

+ "4.7",

+ "----",

+ "cp",

+ "gs://chrome-perf/Android Builder/full-build-linux_deadbeef.zip",

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

- "name": "sizes"

+ "name": "gsutil download_build_product"

{

"cmd": [

- "python",

- "-u",

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

- "perf",

- "--release",

- "--verbose",

- "--steps",

- "{\"steps\": {\"resource_sizes (CronetSample.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/CronetSample.apk'\", \"device_affinity\": null}}, \"version\": 1}",

- "--blacklist-file",

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

- "--num-retries",

- "0",

- "--adb-path",

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

+ "unzip",

+ "-o",

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

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

- "env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

- },

- "name": "Sharded Perf Tests"

- },

- {

- "cmd": [

- "python",

- "-u",

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

- "perf",

- "--steps",

- "--output-json-list",

- "/path/to/tmp/json",

- "--blacklist-file",

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

- "--adb-path",

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

- ],

- "env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

- },

- "name": "get perf test list",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output@[@@@",

- "@@@STEP_LOG_LINE@json.output@ {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"end_time\": 1443438432.949711, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"has_archive\": true, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"test\": \"perf_test.foo\"@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"test\": \"page_cycler.foo\"@@@",

- "@@@STEP_LOG_LINE@json.output@ }@@@",

- "@@@STEP_LOG_LINE@json.output@]@@@",

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "allow_subannotations": true,

- "cmd": [

- "python",

- "-u",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

- "--target",

- "Release",

- "--test-platform",

- "android",

- "--no-xvfb",

- "--factory-properties",

- "--build-properties",

- "--annotate=graphing",

- "--results-url=https://chromeperf.appspot.com",

- "--perf-dashboard-id=page_cycler.foo",

- "--perf-id=android_cronet_l_builder",

- "--test-type=page_cycler.foo",

- "--step-name=page_cycler.foo",

- "--builder-name=Android Cronet Lollipop Builder",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--run-python-script",

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

- "perf",

- "--print-step",

- "page_cycler.foo",

- "--verbose",

- "--adb-path",

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

- "--blacklist-file",

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

- ],

- "env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

- },

- "name": "page_cycler.foo",

- "~followup_annotations": [

- "@@@STEP_TEXT@ Device Affinity: 0 @@@",

- "@@@STEP_LOG_LINE@device affinity@0@@@",

- "@@@STEP_LOG_END@device affinity@@@"

- ]

- },

- {

- "allow_subannotations": true,

- "cmd": [

- "python",

- "-u",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

- "--target",

- "Release",

- "--test-platform",

- "android",

- "--no-xvfb",

- "--factory-properties",

- "--build-properties",

- "--annotate=graphing",

- "--results-url=https://chromeperf.appspot.com",

- "--perf-dashboard-id=perf_test.foo",

- "--perf-id=android_cronet_l_builder",

- "--test-type=perf_test.foo",

- "--step-name=perf_test.foo",

- "--builder-name=Android Cronet Lollipop Builder",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--run-python-script",

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

- "perf",

- "--print-step",

- "perf_test.foo",

- "--verbose",

- "--adb-path",

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

- "--blacklist-file",

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

- ],

- "env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

- },

- "name": "perf_test.foo",

- "~followup_annotations": [

- "@@@STEP_TEXT@ Device Affinity: 0 @@@",

- "@@@STEP_LOG_LINE@device affinity@0@@@",

- "@@@STEP_LOG_END@device affinity@@@"

- ]

+ "name": "unzip_build_product"

{

"cmd": [

@@ -509,7 +209,7 @@

"-u",

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

"-f",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

"~/adb"

"name": "create adb symlink"

@@ -520,7 +220,7 @@

"--",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"

"env": {

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

@@ -540,7 +240,7 @@

"--",

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

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

"--blacklist-file",

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

@@ -553,7 +253,7 @@

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"

"env": {

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

@@ -569,8 +269,9 @@

"--known-devices-file",

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

"--adb-path",

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

- "-v"

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

+ "-v",

+ "--enable-usb-reset"

"env": {

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

@@ -584,13 +285,19 @@

"-u",

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

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

"--blacklist-file",

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

"--output-device-blacklist",

"/path/to/tmp/json",

"-t",

- "Release"

+ "Release",

+ "--min-battery-level",

+ "95",

+ "--disable-network",

+ "--disable-java-debug",

+ "--max-battery-temp",

+ "350"

"env": {

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

@@ -610,7 +317,7 @@

"--buildbot-path",

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

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

"-v",

"--overwrite-known-devices-files"

@@ -718,69 +425,310 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/out/Release/bin/run_cronet_unittests",

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

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

+ "/path/to/tmp/"

+ ],

+ "name": "get version"

+ },

+ {

+ "cmd": [

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

+ "ChromePublic.apk",

+ "-v",

"--blacklist-file",

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

- "--verbose",

- "-t",

- "180",

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/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"

- "name": "cronet_unittests"

+ "name": "install ChromePublic.apk"

+ },

+ {

+ "cmd": [

+ "[SLAVE_BUILD]/src/testing/scripts/host_info.py",

+ "--build-config-fs",

+ "Release",

+ "--paths",

+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

+ "--properties",

+ "--args",

+ "[\"--known-devices-file\", \"[HOME]/.android/known_devices.json\"]",

+ "run",

+ "--output",

+ "/path/to/tmp/json"

+ ],

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

+ },

+ "name": "Host Info",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@{@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"_host_info\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"devices\": [@@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"Max charging current\": \"500000\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"240\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4302\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": null, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"ro.build.fingerprint\": \"fingerprint\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"ro.build.id\": \"MDB08Q\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"ro.build.product\": \"bullhead\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"serial\": \"00d0d567893340f4\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@ ], @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"free_disk_space\": \"free_disk_space\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"num_cpus\": \"num_cpus\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"os_release\": \"os_release\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"os_system\": \"os_system\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"processor\": \"processor\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"python_path\": \"python_path\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"python_version\": \"python_version\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

{

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/out/Release/bin/run_net_unittests",

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

+ "list",

+ "--browser",

+ "android-chromium",

+ "--json-output",

+ "/path/to/tmp/json",

+ "--num-shards",

+ "21",

+ "--device",

+ "07a00ca4"

+ ],

+ "name": "List Perf Tests",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@{@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 13@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 11, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--release",

+ "--verbose",

+ "--steps",

+ "{\"steps\": {}, \"version\": 2}",

"--blacklist-file",

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

- "--verbose",

- "-t",

- "180",

+ "--num-retries",

+ "0",

+ "--collect-chartjson-data",

+ "--max-battery-temp",

+ "350",

+ "--known-devices-file",

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

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"

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

"env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

- "name": "net_unittests"

+ "name": "Sharded Perf Tests"

{

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/out/Release/bin/run_cronet_sample_test_apk",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--steps",

+ "{\"steps\": {}, \"version\": 2}",

+ "--output-json-list",

+ "/path/to/tmp/json",

"--blacklist-file",

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

- "--verbose",

- "--num-retries",

- "0",

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"

- "name": "cronet_sample_test_apk"

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

+ },

+ "name": "get perf test list",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@[@@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"end_time\": 1443438432.949711, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"has_archive\": true, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"perf_test.foo\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"page_cycler.foo\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@]@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

{

+ "allow_subannotations": true,

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/out/Release/bin/run_cronet_test_instrumentation_apk",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

+ "--target",

+ "Release",

+ "--test-platform",

+ "android",

+ "--no-xvfb",

+ "--factory-properties",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android One Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"parent_buildername\", \"parent_buildnumber\": \"1729\", \"parent_revision\": \"deadbeef\", \"path_config\": \"kitchen\", \"recipe\": \"android/perf\", \"repo_name\": \"src\", \"repo_url\": \"https://chromium.googlesource.com/chromium/src.git\", \"revision\": \"deadbeef\", \"slavename\": \"slavename\", \"target\": \"Release\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "--build-properties",

+ "--annotate=graphing",

+ "--results-url=https://chromeperf.appspot.com",

+ "--perf-dashboard-id=page_cycler.foo",

+ "--perf-id=android-one",

+ "--test-type=page_cycler.foo",

+ "--step-name=page_cycler.foo",

+ "--chartjson-file",

+ "/path/to/tmp/json",

+ "--builder-name=Android One Perf (3)",

+ "--slave-name=slavename",

+ "--build-number=571",

+ "--run-python-script",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--print-step",

+ "page_cycler.foo",

+ "--verbose",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

"--blacklist-file",

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

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

+ ],

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

+ },

+ "name": "page_cycler.foo",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@ Device Affinity: 0 @@@",

+ "@@@STEP_LOG_LINE@json.output@[]@@@",

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@STEP_LOG_LINE@device affinity@0@@@",

+ "@@@STEP_LOG_END@device affinity@@@"

+ ]

+ },

+ {

+ "allow_subannotations": true,

+ "cmd": [

+ "python",

+ "-u",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

+ "--target",

+ "Release",

+ "--test-platform",

+ "android",

+ "--no-xvfb",

+ "--factory-properties",

+ "--build-properties",

+ "--annotate=graphing",

+ "--results-url=https://chromeperf.appspot.com",

+ "--perf-dashboard-id=perf_test.foo",

+ "--perf-id=android-one",

+ "--test-type=perf_test.foo",

+ "--step-name=perf_test.foo",

+ "--chartjson-file",

+ "/path/to/tmp/json",

+ "--builder-name=Android One Perf (3)",

+ "--slave-name=slavename",

+ "--build-number=571",

+ "--run-python-script",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--print-step",

+ "perf_test.foo",

"--verbose",

- "--num-retries",

- "0",

"--adb-path",

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

+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",

+ "--blacklist-file",

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

- "name": "cronet_test_instrumentation_apk"

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"

+ },

+ "name": "perf_test.foo",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@ Device Affinity: 0 @@@",

+ "@@@STEP_LOG_LINE@json.output@[]@@@",

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@STEP_LOG_LINE@device affinity@0@@@",

+ "@@@STEP_LOG_END@device affinity@@@"

+ ]

{

"cmd": [

@@ -819,11 +767,11 @@

"----",

"cp",

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

- "gs://chromium-android/logcat_dumps/Android Cronet Lollipop Builder/571"

+ "gs://chromium-android/logcat_dumps/Android One Perf (3)/571"

"name": "gsutil upload",

"~followup_annotations": [

- "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Cronet Lollipop Builder/571@@@"

+ "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android One Perf (3)/571@@@"

]

{

@@ -849,7 +797,7 @@

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

"/path/to/tmp/"

- "name": "get version"

+ "name": "get version (2)"

{

"cmd": [