diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/infra | |
parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/infra')
61 files changed, 2170 insertions, 1238 deletions
diff --git a/chromium/infra/config/cq.cfg b/chromium/infra/config/cq.cfg index 6deec3160f5..580f116c9cc 100644 --- a/chromium/infra/config/cq.cfg +++ b/chromium/infra/config/cq.cfg @@ -32,20 +32,14 @@ verifiers { builders { name: "android_arm64_dbg_recipe" } builders { name: "android_clang_dbg_recipe" } builders { name: "android_compile_dbg" } + builders { name: "android_cronet" } builders { name: "android_n5x_swarming_rel" } builders { name: "cast_shell_android" } - builders { - name: "android_cronet" - experiment_percentage: 100 - } builders { name: "linux_android_rel_ng" } } buckets { name: "master.tryserver.chromium.linux" - builders { - name: "blimp_linux_dbg" - experiment_percentage: 50 - } + builders { name: "blimp_linux_dbg" } builders { name: "cast_shell_linux" } builders { name: "chromeos_amd64-generic_chromium_compile_only_ng" } builders { name: "chromeos_daisy_chromium_compile_only_ng" } @@ -57,6 +51,10 @@ verifiers { builders { name: "linux_chromium_chromeos_rel_ng" } builders { name: "linux_chromium_clobber_rel_ng" } builders { name: "linux_chromium_compile_dbg_ng" } + builders { + name: "linux_chromium_headless_rel" + experiment_percentage: 10 + } builders { name: "linux_chromium_rel_ng" } } buckets { @@ -64,14 +62,14 @@ verifiers { builders { name: "ios-device" } builders { name: "ios-simulator" } builders { - name: "ios-simulator-swarming" + name: "ios-simulator-xcode-clang" experiment_percentage: 50 } builders { name: "mac_chromium_compile_dbg_ng" } builders { name: "mac_chromium_rel_ng" } builders { name: "mac_chromium_10.10_rel_ng" - experiment_percentage: 50 + experiment_percentage: 10 } } buckets { diff --git a/chromium/infra/config/recipes.cfg b/chromium/infra/config/recipes.cfg index 683bba255cf..274be9f8f04 100644 --- a/chromium/infra/config/recipes.cfg +++ b/chromium/infra/config/recipes.cfg @@ -5,17 +5,17 @@ deps { project_id: "build" url: "https://chromium.googlesource.com/chromium/tools/build.git" branch: "master" - revision: "b5cecfe7c5a9684ea21d08599cbcc85a419dd190" + revision: "6c22f32afe765d18c5325212b62d255b2e455a7c" } deps { project_id: "depot_tools" url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git" branch: "master" - revision: "a3f10315eb5597be73cdfc1a4a1145fe3cc3b541" + revision: "cb1beaa79fbeb9f480a9838480f846ed4e0ea19f" } deps { project_id: "recipe_engine" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" branch: "master" - revision: "825386b5d616ed1e5fca94ec76eb6de9335b86d2" + revision: "67fe1f3ccee14c273b3d7d6235280497b4413cba" } diff --git a/chromium/infra/recipes.py b/chromium/infra/recipes.py index 7037b9eee15..f62211f8468 100755 --- a/chromium/infra/recipes.py +++ b/chromium/infra/recipes.py @@ -1,8 +1,8 @@ #!/usr/bin/env python -# Copyright 2016 The LUCI Authors. All rights reserved. -# Use of this source code is governed under the Apache License, Version 2.0 -# that can be found in the LICENSE file. +# Copyright (c) 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. """Bootstrap script to clone and forward to the recipe engine tool. @@ -161,8 +161,7 @@ def main(): time.sleep(random.uniform(2,5)) ensure_engine() - args = ['--package', recipes_cfg_path, - '--bootstrap-script', __file__] + sys.argv[1:] + args = ['--package', recipes_cfg_path] + sys.argv[1:] return _subprocess_call([ sys.executable, '-u', os.path.join(engine_path, engine_subpath, 'recipes.py')] + args) diff --git a/chromium/infra/recipes/OWNERS b/chromium/infra/recipes/OWNERS new file mode 100644 index 00000000000..cbd8183cd23 --- /dev/null +++ b/chromium/infra/recipes/OWNERS @@ -0,0 +1,2 @@ +per-file blink_downstream.expected=machenbach@chromium.org +per-file blink_downstream.py=machenbach@chromium.org
\ No newline at end of file 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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -390,24 +426,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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\"}" ], @@ -173,6 +173,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -223,10 +241,28 @@ "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", + "-u", "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" ], @@ -398,24 +434,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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\"}" ], @@ -164,6 +164,24 @@ "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", + "-u", "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", "--", "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", @@ -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", @@ -214,10 +232,28 @@ "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", + "-u", "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" ], @@ -389,24 +425,6 @@ "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", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/src/chrome/VERSION", "/path/to/tmp/" @@ -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: diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_fail.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_fail.json index 06eea34462d..3a4546c03b8 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_fail.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_fail.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition/src/out", "--json-test-results", @@ -346,7 +346,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition/src/out", "--build-number", @@ -356,7 +356,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition", "name": "archive_webkit_tests_results", @@ -386,7 +388,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition/src/out", "--json-test-results", @@ -429,6 +431,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [], \"ignored\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Linux 64 - ignition", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition", + "name": "archive_retry_summary" + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_pass.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_pass.json index 62d5979203c..c7b22b32885 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_pass.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64___ignition_pass.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition/src/out", "--json-test-results", @@ -344,7 +344,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition/src/out", "--build-number", @@ -354,7 +354,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64___ignition", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json index c884de0425b..2aa6a5f508a 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__fail.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Debug", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_", "name": "archive_webkit_tests_results", @@ -536,7 +538,7 @@ "--target", "Debug", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_/src/out", "--json-test-results", @@ -579,6 +581,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [], \"ignored\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Linux 64 (dbg)", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_", + "name": "archive_retry_summary" + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__pass.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__pass.json index f1a34249292..369e34602a3 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__pass.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64__dbg__pass.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Debug", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_/src/out", "--json-test-results", @@ -340,7 +340,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_/src/out", "--build-number", @@ -350,7 +350,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64__dbg_", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_fail.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_fail.json index 40d28863885..c1fed1377f0 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_fail.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_fail.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", @@ -536,7 +538,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -579,6 +581,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [], \"ignored\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Linux 64", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", + "name": "archive_retry_summary" + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json index 77b6507707f..aa4791e5dd5 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -340,7 +340,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -350,7 +350,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json index 9163b3d9389..41bbc292337 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json @@ -136,7 +136,7 @@ "--platform", "mac-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -193,6 +193,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", "GYP_CHROMIUM_NO_ACTION": "1", "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1", @@ -218,6 +219,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "generate_build_files (with patch)" @@ -235,6 +237,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "clang_revision", @@ -284,6 +287,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "compile (with patch)", @@ -332,7 +336,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Mac/src/out", "--json-test-results", @@ -363,7 +367,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Mac/src/out", "--build-number", @@ -373,7 +377,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "name": "archive_webkit_tests_results", @@ -485,6 +491,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "generate_build_files (without patch)" @@ -502,6 +509,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "clang_revision (2)", @@ -551,6 +559,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "compile (without patch)", @@ -579,7 +588,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Mac/src/out", "--json-test-results", @@ -622,6 +631,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [], \"ignored\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Mac", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", + "name": "archive_retry_summary" + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json index a926879c29a..811f7469899 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json @@ -136,7 +136,7 @@ "--platform", "mac-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -193,6 +193,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", "GYP_CHROMIUM_NO_ACTION": "1", "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1", @@ -218,6 +219,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "generate_build_files (with patch)" @@ -235,6 +237,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "clang_revision", @@ -284,6 +287,7 @@ ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "env": { + "FORCE_MAC_TOOLCHAIN": "1", "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" }, "name": "compile (with patch)", @@ -332,7 +336,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Mac/src/out", "--json-test-results", @@ -361,7 +365,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Mac/src/out", "--build-number", @@ -371,7 +375,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Mac", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_fail.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_fail.json index 0d6a3a8258f..bb6364572c5 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_fail.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_fail.json @@ -136,7 +136,7 @@ "--platform", "windows-386", "--dest-directory", - "[SLAVE_BUILD]\\cipd", + "[START_DIR]\\cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]\\\\cipd\\\\cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\cipd\\cipd", + "[START_DIR]\\cipd\\cipd", "ensure", "--root", "[CACHE]\\cipd\\goma", @@ -297,7 +297,7 @@ "--target", "Release", "--results-directory", - "[SLAVE_BUILD]\\layout-test-results", + "[START_DIR]\\layout-test-results", "--build-dir", "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out", "--json-test-results", @@ -331,7 +331,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\chromium\\archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]\\layout-test-results", + "[START_DIR]\\layout-test-results", "--build-dir", "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out", "--build-number", @@ -341,7 +341,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]\\chrome_staging" + "[CACHE]\\chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py" ], "cwd": "[BUILDER_CACHE]\\V8_Blink_Win", "name": "archive_webkit_tests_results", @@ -512,7 +514,7 @@ "--target", "Release", "--results-directory", - "[SLAVE_BUILD]\\layout-test-results", + "[START_DIR]\\layout-test-results", "--build-dir", "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out", "--json-test-results", @@ -558,6 +560,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\chromium\\archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [], \"ignored\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"]}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Win", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win", + "name": "archive_retry_summary" + }, + { "name": "$result", "recipe_result": null, "status_code": 0 diff --git a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json index 2d66e231729..a4f61708941 100644 --- a/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json +++ b/chromium/infra/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json @@ -136,7 +136,7 @@ "--platform", "windows-386", "--dest-directory", - "[SLAVE_BUILD]\\cipd", + "[START_DIR]\\cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]\\\\cipd\\\\cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\cipd\\cipd", + "[START_DIR]\\cipd\\cipd", "ensure", "--root", "[CACHE]\\cipd\\goma", @@ -297,7 +297,7 @@ "--target", "Release", "--results-directory", - "[SLAVE_BUILD]\\layout-test-results", + "[START_DIR]\\layout-test-results", "--build-dir", "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out", "--json-test-results", @@ -329,7 +329,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\chromium\\archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]\\layout-test-results", + "[START_DIR]\\layout-test-results", "--build-dir", "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out", "--build-number", @@ -339,7 +339,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]\\chrome_staging" + "[CACHE]\\chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py" ], "cwd": "[BUILDER_CACHE]\\V8_Blink_Win", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/minimal_pass_continues.json b/chromium/infra/recipes/blink_downstream.expected/minimal_pass_continues.json index 91efede6758..3d561e73de8 100644 --- a/chromium/infra/recipes/blink_downstream.expected/minimal_pass_continues.json +++ b/chromium/infra/recipes/blink_downstream.expected/minimal_pass_continues.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", @@ -536,7 +538,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -578,6 +580,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [\"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"], \"ignored\": []}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Linux 64", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", + "name": "archive_retry_summary" + }, + { "name": "$result", "reason": "1 out of 1 aggregated steps failed. Failures: Step('webkit_tests (retry summary)') failed with return_code 1", "recipe_result": null, diff --git a/chromium/infra/recipes/blink_downstream.expected/too_many_failures_for_retcode.json b/chromium/infra/recipes/blink_downstream.expected/too_many_failures_for_retcode.json index 773d710f708..eac6c971af5 100644 --- a/chromium/infra/recipes/blink_downstream.expected/too_many_failures_for_retcode.json +++ b/chromium/infra/recipes/blink_downstream.expected/too_many_failures_for_retcode.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", @@ -536,7 +538,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -578,6 +580,23 @@ ] }, { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py", + "--retry-summary-json", + "{\"failures\": [\"bad/failing0.html\", \"bad/failing1.html\", \"bad/failing10.html\", \"bad/failing100.html\", \"bad/failing101.html\", \"bad/failing102.html\", \"bad/failing103.html\", \"bad/failing104.html\", \"bad/failing105.html\", \"bad/failing106.html\", \"bad/failing107.html\", \"bad/failing108.html\", \"bad/failing109.html\", \"bad/failing11.html\", \"bad/failing110.html\", \"bad/failing111.html\", \"bad/failing112.html\", \"bad/failing113.html\", \"bad/failing114.html\", \"bad/failing115.html\", \"bad/failing116.html\", \"bad/failing117.html\", \"bad/failing118.html\", \"bad/failing119.html\", \"bad/failing12.html\", \"bad/failing120.html\", \"bad/failing121.html\", \"bad/failing122.html\", \"bad/failing123.html\", \"bad/failing124.html\", \"bad/failing13.html\", \"bad/failing14.html\", \"bad/failing15.html\", \"bad/failing16.html\", \"bad/failing17.html\", \"bad/failing18.html\", \"bad/failing19.html\", \"bad/failing2.html\", \"bad/failing20.html\", \"bad/failing21.html\", \"bad/failing22.html\", \"bad/failing23.html\", \"bad/failing24.html\", \"bad/failing25.html\", \"bad/failing26.html\", \"bad/failing27.html\", \"bad/failing28.html\", \"bad/failing29.html\", \"bad/failing3.html\", \"bad/failing30.html\", \"bad/failing31.html\", \"bad/failing32.html\", \"bad/failing33.html\", \"bad/failing34.html\", \"bad/failing35.html\", \"bad/failing36.html\", \"bad/failing37.html\", \"bad/failing38.html\", \"bad/failing39.html\", \"bad/failing4.html\", \"bad/failing40.html\", \"bad/failing41.html\", \"bad/failing42.html\", \"bad/failing43.html\", \"bad/failing44.html\", \"bad/failing45.html\", \"bad/failing46.html\", \"bad/failing47.html\", \"bad/failing48.html\", \"bad/failing49.html\", \"bad/failing5.html\", \"bad/failing50.html\", \"bad/failing51.html\", \"bad/failing52.html\", \"bad/failing53.html\", \"bad/failing54.html\", \"bad/failing55.html\", \"bad/failing56.html\", \"bad/failing57.html\", \"bad/failing58.html\", \"bad/failing59.html\", \"bad/failing6.html\", \"bad/failing60.html\", \"bad/failing61.html\", \"bad/failing62.html\", \"bad/failing63.html\", \"bad/failing64.html\", \"bad/failing65.html\", \"bad/failing66.html\", \"bad/failing67.html\", \"bad/failing68.html\", \"bad/failing69.html\", \"bad/failing7.html\", \"bad/failing70.html\", \"bad/failing71.html\", \"bad/failing72.html\", \"bad/failing73.html\", \"bad/failing74.html\", \"bad/failing75.html\", \"bad/failing76.html\", \"bad/failing77.html\", \"bad/failing78.html\", \"bad/failing79.html\", \"bad/failing8.html\", \"bad/failing80.html\", \"bad/failing81.html\", \"bad/failing82.html\", \"bad/failing83.html\", \"bad/failing84.html\", \"bad/failing85.html\", \"bad/failing86.html\", \"bad/failing87.html\", \"bad/failing88.html\", \"bad/failing89.html\", \"bad/failing9.html\", \"bad/failing90.html\", \"bad/failing91.html\", \"bad/failing92.html\", \"bad/failing93.html\", \"bad/failing94.html\", \"bad/failing95.html\", \"bad/failing96.html\", \"bad/failing97.html\", \"bad/failing98.html\", \"bad/failing99.html\", \"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"], \"ignored\": []}", + "--build-number", + "571", + "--builder-name", + "V8-Blink Linux 64", + "--gs-bucket", + "gs://chromium-layout-test-archives" + ], + "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", + "name": "archive_retry_summary" + }, + { "name": "$result", "reason": "1 out of 1 aggregated steps failed. Failures: Step('webkit_tests (retry summary)') failed with return_code 1", "recipe_result": null, diff --git a/chromium/infra/recipes/blink_downstream.expected/webkit_tests_interrupted.json b/chromium/infra/recipes/blink_downstream.expected/webkit_tests_interrupted.json index 60faf0859cf..ef2d61f59f7 100644 --- a/chromium/infra/recipes/blink_downstream.expected/webkit_tests_interrupted.json +++ b/chromium/infra/recipes/blink_downstream.expected/webkit_tests_interrupted.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.expected/webkit_tests_unexpected_error.json b/chromium/infra/recipes/blink_downstream.expected/webkit_tests_unexpected_error.json index cb3e455c86b..018c6cfe076 100644 --- a/chromium/infra/recipes/blink_downstream.expected/webkit_tests_unexpected_error.json +++ b/chromium/infra/recipes/blink_downstream.expected/webkit_tests_unexpected_error.json @@ -136,7 +136,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -146,7 +146,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -154,7 +154,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -311,7 +311,7 @@ "--target", "Release", "-o", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--json-test-results", @@ -342,7 +342,7 @@ "-u", "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py", "--results-dir", - "[SLAVE_BUILD]/layout-test-results", + "[START_DIR]/layout-test-results", "--build-dir", "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", "--build-number", @@ -352,7 +352,9 @@ "--gs-bucket", "gs://chromium-layout-test-archives", "--staging-dir", - "[CACHE]/chrome_staging" + "[CACHE]/chrome_staging", + "--slave-utils-gsutil-py-path", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py" ], "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", "name": "archive_webkit_tests_results", diff --git a/chromium/infra/recipes/blink_downstream.py b/chromium/infra/recipes/blink_downstream.py index 5f5258fd58c..9aebfcfcef4 100644 --- a/chromium/infra/recipes/blink_downstream.py +++ b/chromium/infra/recipes/blink_downstream.py @@ -28,6 +28,7 @@ in a forced build with no revision provided). from recipe_engine.types import freeze DEPS = [ + 'build/build', 'build/chromium', 'build/chromium_checkout', 'build/chromium_tests', diff --git a/chromium/infra/recipes/chromium.expected/builder.json b/chromium/infra/recipes/chromium.expected/builder.json index bc53688c914..5b62f00e6b8 100644 --- a/chromium/infra/recipes/chromium.expected/builder.json +++ b/chromium/infra/recipes/chromium.expected/builder.json @@ -42,7 +42,6 @@ ], "cwd": "[BUILDER_CACHE]/Linux_remote_run_Builder", "env": { - "GCLIENT_KILL_GIT_FETCH_AFTER": "1200", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "bot_update", @@ -133,7 +132,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -142,7 +141,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -150,7 +149,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", @@ -372,7 +371,8 @@ "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399", "parent_got_v8_revision_cp": "refs/heads/master@{#43426}", "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4", - "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}" + "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}", + "parent_mastername": "chromium.fyi" } } ], diff --git a/chromium/infra/recipes/chromium.expected/tester.json b/chromium/infra/recipes/chromium.expected/tester.json index 3d29106242b..d0f9f494655 100644 --- a/chromium/infra/recipes/chromium.expected/tester.json +++ b/chromium/infra/recipes/chromium.expected/tester.json @@ -42,7 +42,6 @@ ], "cwd": "[BUILDER_CACHE]/Linux_remote_run_Tester", "env": { - "GCLIENT_KILL_GIT_FETCH_AFTER": "1200", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "bot_update", @@ -133,7 +132,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -142,7 +141,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -150,7 +149,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", diff --git a/chromium/infra/recipes/chromium.py b/chromium/infra/recipes/chromium.py index 2688870ca97..4f9d491577f 100644 --- a/chromium/infra/recipes/chromium.py +++ b/chromium/infra/recipes/chromium.py @@ -5,6 +5,7 @@ DEPS = [ 'build/adb', 'build/bisect_tester', + 'build/build', 'build/chromium', 'build/chromium_android', 'build/chromium_swarming', diff --git a/chromium/infra/recipes/chromium_trybot.expected/basic.json b/chromium/infra/recipes/chromium_trybot.expected/basic.json index 7cd9a907d2b..70e00a9282b 100644 --- a/chromium/infra/recipes/chromium_trybot.expected/basic.json +++ b/chromium/infra/recipes/chromium_trybot.expected/basic.json @@ -48,7 +48,6 @@ ], "cwd": "[BUILDER_CACHE]/linux", "env": { - "GCLIENT_KILL_GIT_FETCH_AFTER": "1200", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "bot_update", @@ -139,7 +138,7 @@ "--platform", "linux-amd64", "--dest-directory", - "[SLAVE_BUILD]/cipd", + "[START_DIR]/cipd", "--json-output", "/path/to/tmp/json" ], @@ -148,7 +147,7 @@ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@", "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", "@@@STEP_LOG_LINE@json.output@}@@@", "@@@STEP_LOG_END@json.output@@@" @@ -156,7 +155,7 @@ }, { "cmd": [ - "[SLAVE_BUILD]/cipd/cipd", + "[START_DIR]/cipd/cipd", "ensure", "--root", "[CACHE]/cipd/goma", diff --git a/chromium/infra/recipes/chromium_trybot.py b/chromium/infra/recipes/chromium_trybot.py index 5f2ae4b5df4..990f1c177b6 100644 --- a/chromium/infra/recipes/chromium_trybot.py +++ b/chromium/infra/recipes/chromium_trybot.py @@ -3,6 +3,7 @@ # found in the LICENSE file. DEPS = [ + 'build/build', 'build/chromium', 'build/chromium_android', 'build/chromium_checkout', diff --git a/chromium/infra/scripts/legacy/scripts/slave/runtest.py b/chromium/infra/scripts/legacy/scripts/slave/runtest.py index ac54b3d8d64..d7f1a4adb97 100755 --- a/chromium/infra/scripts/legacy/scripts/slave/runtest.py +++ b/chromium/infra/scripts/legacy/scripts/slave/runtest.py @@ -481,10 +481,6 @@ def main(): help='Source paths in stack traces will be stripped ' 'of prefixes ending with this substring. This ' 'option is used by sanitizer tools.') - option_parser.add_option('--no-spawn-dbus', action='store_true', - default=False, - help='Disable GLib DBus bug workaround: ' - 'manually spawning dbus-launch') option_parser.add_option('--test-launcher-summary-output', help='Path to test results file with all the info ' 'from the test launcher') @@ -518,9 +514,7 @@ def main(): print '[Running on builder: "%s"]' % options.builder_name - did_launch_dbus = False - if not options.no_spawn_dbus: - did_launch_dbus = _LaunchDBus() + did_launch_dbus = _LaunchDBus() try: options.build_dir = build_directory.GetBuildOutputDirectory() diff --git a/chromium/infra/unittests/recipes_test.py b/chromium/infra/unittests/recipes_test.py index 7713425b926..ba5149ea27f 100755 --- a/chromium/infra/unittests/recipes_test.py +++ b/chromium/infra/unittests/recipes_test.py @@ -12,8 +12,11 @@ INFRA_DIR = os.path.dirname(THIS_DIR) def recipes_py(*args): - subprocess.check_call( - [os.path.join(INFRA_DIR, 'recipes.py'), '--use-bootstrap'] + list(args)) + subprocess.check_call([ + os.path.join(INFRA_DIR, 'recipes.py'), + '--deps-path=-', + '--use-bootstrap', + ] + list(args)) recipes_py('simulation_test') |