From e733310db58160074f574c429d48f8308c0afe17 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 8 Mar 2017 10:28:10 +0100 Subject: BASELINE: Update Chromium to 56.0.2924.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning --- ...l_chromium_perf_Android_Galaxy_S5_Perf__1_.json | 88 +++++++++++++-------- ...l_chromium_perf_Android_Galaxy_S5_Perf__2_.json | 88 +++++++++++++-------- ...l_chromium_perf_Android_Galaxy_S5_Perf__3_.json | 88 +++++++++++++-------- ...ull_chromium_perf_Android_Nexus5X_Perf__1_.json | 88 +++++++++++++-------- ...ull_chromium_perf_Android_Nexus5X_Perf__2_.json | 88 +++++++++++++-------- ...ull_chromium_perf_Android_Nexus5X_Perf__3_.json | 88 +++++++++++++-------- ...mium_perf_Android_Nexus5X_WebView_Perf__1_.json | 90 ++++++++++++++-------- ...mium_perf_Android_Nexus5X_WebView_Perf__2_.json | 90 ++++++++++++++-------- ...mium_perf_Android_Nexus5X_WebView_Perf__3_.json | 90 ++++++++++++++-------- ...full_chromium_perf_Android_Nexus5_Perf__1_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus5_Perf__2_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus5_Perf__3_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus6_Perf__1_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus6_Perf__2_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus6_Perf__3_.json | 88 +++++++++++++-------- ...omium_perf_Android_Nexus6_WebView_Perf__1_.json | 90 ++++++++++++++-------- ...omium_perf_Android_Nexus6_WebView_Perf__2_.json | 90 ++++++++++++++-------- ...omium_perf_Android_Nexus6_WebView_Perf__3_.json | 90 ++++++++++++++-------- ...ll_chromium_perf_Android_Nexus7v2_Perf__1_.json | 88 +++++++++++++-------- ...ll_chromium_perf_Android_Nexus7v2_Perf__2_.json | 88 +++++++++++++-------- ...ll_chromium_perf_Android_Nexus7v2_Perf__3_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus9_Perf__1_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus9_Perf__2_.json | 88 +++++++++++++-------- ...full_chromium_perf_Android_Nexus9_Perf__3_.json | 88 +++++++++++++-------- .../full_chromium_perf_Android_One_Perf__1_.json | 88 +++++++++++++-------- .../full_chromium_perf_Android_One_Perf__2_.json | 88 +++++++++++++-------- .../full_chromium_perf_Android_One_Perf__3_.json | 88 +++++++++++++-------- ...m_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json | 88 +++++++++++++-------- .../perf.expected/get_perf_test_list_old_data.json | 88 +++++++++++++-------- .../android/perf.expected/host_info_failure.json | 88 +++++++++++++-------- .../android/perf.expected/missing_device.json | 88 +++++++++++++-------- .../android/perf.expected/provision_devices.json | 54 ++++++++++--- .../perf.expected/src_side_script_fails.json | 88 +++++++++++++-------- .../android/perf.expected/test_failure.json | 88 +++++++++++++-------- chromium/infra/recipes/android/perf.py | 21 ++++- 35 files changed, 1884 insertions(+), 1107 deletions(-) (limited to 'chromium/infra/recipes/android') diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json index 69d4588c0ae..984859fd7b1 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Galaxy S5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-galaxy-s5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json index aeea73bce34..8ca50ec157e 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Galaxy S5 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-galaxy-s5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__3_.json index 2e4d1c5ab04..61fa35dfb3b 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Galaxy_S5_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Galaxy S5 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-galaxy-s5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__1_.json index 8f7c865e466..40cc7a83c72 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5X\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__2_.json index b35861e8ef9..fd247525330 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5X\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__3_.json index 92891446355..4f8cd688a8f 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5X\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__1_.json index 553a56e5358..e41956af06a 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X WebView Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__2_.json index bc6d9b57921..8ee6dd5f13e 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X WebView Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__3_.json index 2aba7476579..38d18327f02 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5X_WebView_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5X WebView Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json index f900c5aadd9..71bb2620de7 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json index 59e6edc0c5f..154bc21bf35 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__3_.json index 148342113e9..8aee4b42986 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__1_.json index 9140b587fbc..58d777d692a 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus6\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__2_.json index 7998c63bd83..b84b7b8134f 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus6\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__3_.json index f7a3657b4ce..a61e7636fb1 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus6\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__1_.json index ce8e67bb005..96214877f18 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 WebView Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__2_.json index fd4de4b701a..e76a2ff0380 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 WebView Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 5, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__3_.json index da14f3a541a..2c7ef22a8fe 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus6_WebView_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus6 WebView Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -282,7 +318,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" ], @@ -386,24 +422,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -422,7 +440,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -449,7 +467,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -583,11 +601,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 1}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -610,7 +632,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -667,7 +689,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -718,7 +740,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json index 2007a0965a3..71623a89ef3 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus7v2 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus7v2\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json index 66f88d758f1..cde6918fe85 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus7v2 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus7v2\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__3_.json index 3a31493216b..48fa098d846 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus7v2 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus7v2\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__1_.json index 76eaf62adc5..77034623df0 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus9 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus9\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json index f418591654a..f1de011090a 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus9 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus9\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__3_.json index 3bd2c1d7b23..15f5ec746db 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_Nexus9_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus9 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus9\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__1_.json index 963a94497ad..e9cb29c8353 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/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 (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-one\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__2_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__2_.json index efdcb73f377..9f236e7f9a4 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__2_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__2_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/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 (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-one\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json index 0bace20260b..a41a6a795ab 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_Android_One_Perf__3_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/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\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json index 097bf620768..1ecc07287e3 100644 --- a/chromium/infra/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json +++ b/chromium/infra/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Power_Nexus_5X_Perf__1_.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Power Nexus 5X Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,11 +573,15 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}, \"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 6}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 4, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", - "[HOME]/.android/known_devices.json" + "[HOME]/.android/known_devices.json", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -582,7 +604,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -639,7 +661,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], @@ -690,7 +712,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json" ], diff --git a/chromium/infra/recipes/android/perf.expected/get_perf_test_list_old_data.json b/chromium/infra/recipes/android/perf.expected/get_perf_test_list_old_data.json index 63e926b44fb..210c0404134 100644 --- a/chromium/infra/recipes/android/perf.expected/get_perf_test_list_old_data.json +++ b/chromium/infra/recipes/android/perf.expected/get_perf_test_list_old_data.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -632,7 +654,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -681,7 +703,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/host_info_failure.json b/chromium/infra/recipes/android/perf.expected/host_info_failure.json index 0f72f5f7ce7..d2764687366 100644 --- a/chromium/infra/recipes/android/perf.expected/host_info_failure.json +++ b/chromium/infra/recipes/android/perf.expected/host_info_failure.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -564,12 +582,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -592,7 +614,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -649,7 +671,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -701,7 +723,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/missing_device.json b/chromium/infra/recipes/android/perf.expected/missing_device.json index 76146bfb27b..8cc1f1af190 100644 --- a/chromium/infra/recipes/android/perf.expected/missing_device.json +++ b/chromium/infra/recipes/android/perf.expected/missing_device.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/provision_devices.json b/chromium/infra/recipes/android/perf.expected/provision_devices.json index 8b40a45b433..07ca24c9651 100644 --- a/chromium/infra/recipes/android/perf.expected/provision_devices.json +++ b/chromium/infra/recipes/android/perf.expected/provision_devices.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", diff --git a/chromium/infra/recipes/android/perf.expected/src_side_script_fails.json b/chromium/infra/recipes/android/perf.expected/src_side_script_fails.json index 392b679e875..004de89bcf2 100644 --- a/chromium/infra/recipes/android/perf.expected/src_side_script_fails.json +++ b/chromium/infra/recipes/android/perf.expected/src_side_script_fails.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"Android Nexus5 Perf (1)\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"scripts\": [@@@", @@ -125,14 +125,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -169,6 +169,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -200,7 +218,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" @@ -211,7 +229,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", @@ -219,6 +237,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -226,7 +262,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", @@ -242,7 +278,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -258,7 +294,7 @@ "-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", @@ -290,7 +326,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" ], @@ -394,24 +430,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -430,7 +448,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -590,12 +608,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -618,7 +640,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -675,7 +697,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -727,7 +749,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.expected/test_failure.json b/chromium/infra/recipes/android/perf.expected/test_failure.json index af7f94df888..fc6d5f3f4e5 100644 --- a/chromium/infra/recipes/android/perf.expected/test_failure.json +++ b/chromium/infra/recipes/android/perf.expected/test_failure.json @@ -102,12 +102,12 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json", + "[START_DIR]/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_TEXT@path: [START_DIR]/src/testing/buildbot/chromium.perf.json@@@", "@@@STEP_LOG_LINE@json.output@{}@@@", "@@@STEP_LOG_END@json.output@@@" ] @@ -116,14 +116,14 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", + "[START_DIR]/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\"}", + "{\"checkout\": \"[START_DIR]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", "--properties", "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}" ], @@ -160,6 +160,24 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "\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": "initialize devil", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@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@@@" + ] + }, { "cmd": [ "python", @@ -191,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" @@ -202,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", @@ -210,6 +228,24 @@ }, "name": "spawn_logcat_monitor" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", + "--action", + "restart", + "--pid-file-path", + "/tmp/device_monitor.pid", + "--", + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py", + "--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" + ], + "name": "spawn_device_monitor" + }, { "cmd": [ "python", @@ -217,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", @@ -233,7 +269,7 @@ "--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", "-v", "--enable-usb-reset" ], @@ -249,7 +285,7 @@ "-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", @@ -281,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" ], @@ -385,24 +421,6 @@ "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" ] }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", - "--action", - "restart", - "--pid-file-path", - "/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", - "[\"07a00ca4\"]", - "--blacklist-file", - "[SLAVE_BUILD]/src/out/bad_devices.json" - ], - "name": "spawn_device_monitor" - }, { "cmd": [ "python", @@ -421,7 +439,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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", "--release" ], "env": { @@ -555,12 +573,16 @@ "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", + "--num-retries", + "0", "--collect-chartjson-data", "--max-battery-temp", "350", "--known-devices-file", "[HOME]/.android/known_devices.json", - "--enable-platform-mode" + "--enable-platform-mode", + "--adb-path", + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb" ], "cwd": "[SLAVE_BUILD]/src", "env": { @@ -583,7 +605,7 @@ "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_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" ], "env": { "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", @@ -640,7 +662,7 @@ "page_cycler.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" @@ -692,7 +714,7 @@ "perf_test.foo", "--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", "--blacklist-file", "[SLAVE_BUILD]/src/out/bad_devices.json", "--enable-platform-mode" diff --git a/chromium/infra/recipes/android/perf.py b/chromium/infra/recipes/android/perf.py index b1d4b8e4db7..d2143d6b0e4 100644 --- a/chromium/infra/recipes/android/perf.py +++ b/chromium/infra/recipes/android/perf.py @@ -146,7 +146,7 @@ def RunSteps(api): test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) scripts_compile_targets = \ - api.chromium_tests.get_compile_targets_for_scripts().json.output + api.chromium_tests.get_compile_targets_for_scripts() builder['tests'] = api.chromium_tests.generate_tests_from_test_spec( api, test_spec, builder, buildername, mastername, False, None, @@ -156,6 +156,22 @@ def RunSteps(api): api.path['checkout'] = api.path['slave_build'].join('src') api.chromium_android.clean_local_files() + # TODO(jbudorick): Remove this after resolving + # https://github.com/catapult-project/catapult/issues/2901 + devil_path = api.path['checkout'].join('third_party', 'catapult', 'devil') + api.python.inline( + 'initialize devil', + """ + import sys + sys.path.append(sys.argv[1]) + from devil import devil_env + devil_env.config.Initialize() + devil_env.config.PrefetchPaths(dependencies=['adb']) + """, + args=[devil_path]) + api.adb.set_adb_path( + devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb')) + api.chromium_android.download_build(bucket=builder['bucket'], path=builder['path'](api)) @@ -188,8 +204,7 @@ def RunSteps(api): num_host_shards=builder.get('num_host_shards', 1), shard_index=builder.get('shard_index', 0), override_browser_name=builder.get('browser_name'), - enable_platform_mode=builder.get('enable_platform_mode'), - pass_adb_path=False) + enable_platform_mode=builder.get('enable_platform_mode')) dynamic_perf_tests.run(api, None) if failures: -- cgit v1.2.1