Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: infra/recipes/android/perf.expected/provision_devices.json

Issue 2431963004: [Android] Always use devil's adb in the perf recipes. (Closed)
Patch Set: revise TODO comment Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", 6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
7 "--spec", 7 "--spec",
8 "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'manag ed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/sr c.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/dat a/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchpl ugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/fram e_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/dat a/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src /data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_test s': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/t ools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webki t/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webk it/data/xbm_decoder': None}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-int ernal.git'}]\ntarget_os = ['android']", 8 "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'manag ed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/sr c.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/dat a/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchpl ugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/fram e_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/dat a/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src /data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_test s': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/t ools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webki t/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webk it/data/xbm_decoder': None}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-int ernal.git'}]\ntarget_os = ['android']",
9 "--patch_root", 9 "--patch_root",
10 "src", 10 "src",
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", 157 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
158 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", 158 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
159 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" , 159 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" ,
160 "@@@STEP_LOG_END@python.inline@@@" 160 "@@@STEP_LOG_END@python.inline@@@"
161 ] 161 ]
162 }, 162 },
163 { 163 {
164 "cmd": [ 164 "cmd": [
165 "python", 165 "python",
166 "-u", 166 "-u",
167 "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\n devil_env.config.Initialize()\n",
168 "[SLAVE_BUILD]/src/third_party/catapult/devil"
169 ],
170 "name": "initialize devil",
171 "~followup_annotations": [
172 "@@@STEP_LOG_LINE@python.inline@@@@",
173 "@@@STEP_LOG_LINE@python.inline@import sys@@@",
174 "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
175 "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
176 "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
177 "@@@STEP_LOG_END@python.inline@@@"
178 ]
179 },
180 {
181 "cmd": [
182 "python",
183 "-u",
167 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", 184 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
168 "--", 185 "--",
169 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", 186 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
170 "--force-version", 187 "--force-version",
171 "4.7", 188 "4.7",
172 "----", 189 "----",
173 "cp", 190 "cp",
174 "gs://chrome-perf/Android Builder/full-build-linux_deadbeef.zip", 191 "gs://chrome-perf/Android Builder/full-build-linux_deadbeef.zip",
175 "[SLAVE_BUILD]/src/out/build_product.zip" 192 "[SLAVE_BUILD]/src/out/build_product.zip"
176 ], 193 ],
177 "name": "gsutil download_build_product" 194 "name": "gsutil download_build_product"
178 }, 195 },
179 { 196 {
180 "cmd": [ 197 "cmd": [
181 "unzip", 198 "unzip",
182 "-o", 199 "-o",
183 "[SLAVE_BUILD]/src/out/build_product.zip" 200 "[SLAVE_BUILD]/src/out/build_product.zip"
184 ], 201 ],
185 "cwd": "[SLAVE_BUILD]/src", 202 "cwd": "[SLAVE_BUILD]/src",
186 "name": "unzip_build_product" 203 "name": "unzip_build_product"
187 }, 204 },
188 { 205 {
189 "cmd": [ 206 "cmd": [
190 "python", 207 "python",
191 "-u", 208 "-u",
192 "[SLAVE_BUILD]/src/build/symlink.py", 209 "[SLAVE_BUILD]/src/build/symlink.py",
193 "-f", 210 "-f",
194 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 211 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db",
195 "~/adb" 212 "~/adb"
196 ], 213 ],
197 "name": "create adb symlink" 214 "name": "create adb symlink"
198 }, 215 },
199 { 216 {
200 "cmd": [ 217 "cmd": [
201 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 218 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
202 "--", 219 "--",
203 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", 220 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
204 "[SLAVE_BUILD]/src/out/logcat", 221 "[SLAVE_BUILD]/src/out/logcat",
205 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 222 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db"
206 ], 223 ],
207 "env": { 224 "env": {
208 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 225 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
209 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 226 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
210 }, 227 },
211 "name": "spawn_logcat_monitor" 228 "name": "spawn_logcat_monitor"
212 }, 229 },
213 { 230 {
214 "cmd": [ 231 "cmd": [
215 "python", 232 "python",
216 "-u", 233 "-u",
217 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 234 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
218 "--action", 235 "--action",
219 "restart", 236 "restart",
220 "--pid-file-path", 237 "--pid-file-path",
221 "/tmp/device_monitor.pid", 238 "/tmp/device_monitor.pid",
222 "--", 239 "--",
223 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_m onitor.py", 240 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_m onitor.py",
224 "--adb-path", 241 "--adb-path",
225 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 242 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db",
226 "--blacklist-file", 243 "--blacklist-file",
227 "[SLAVE_BUILD]/src/out/bad_devices.json" 244 "[SLAVE_BUILD]/src/out/bad_devices.json"
228 ], 245 ],
229 "name": "spawn_device_monitor" 246 "name": "spawn_device_monitor"
230 }, 247 },
231 { 248 {
232 "cmd": [ 249 "cmd": [
233 "python", 250 "python",
234 "-u", 251 "-u",
235 "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py ", 252 "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py ",
236 "--verbose", 253 "--verbose",
237 "--adb-path", 254 "--adb-path",
238 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 255 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db"
239 ], 256 ],
240 "env": { 257 "env": {
241 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 258 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
242 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 259 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
243 }, 260 },
244 "name": "authorize_adb_devices" 261 "name": "authorize_adb_devices"
245 }, 262 },
246 { 263 {
247 "cmd": [ 264 "cmd": [
248 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 265 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py",
249 "--blacklist-file", 266 "--blacklist-file",
250 "[SLAVE_BUILD]/src/out/bad_devices.json", 267 "[SLAVE_BUILD]/src/out/bad_devices.json",
251 "--known-devices-file", 268 "--known-devices-file",
252 "[HOME]/.android/known_devices.json", 269 "[HOME]/.android/known_devices.json",
253 "--adb-path", 270 "--adb-path",
254 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 271 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db",
255 "-v", 272 "-v",
256 "--enable-usb-reset" 273 "--enable-usb-reset"
257 ], 274 ],
258 "env": { 275 "env": {
259 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 276 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
260 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 277 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
261 }, 278 },
262 "name": "device_recovery" 279 "name": "device_recovery"
263 }, 280 },
264 { 281 {
265 "cmd": [ 282 "cmd": [
266 "python", 283 "python",
267 "-u", 284 "-u",
268 "[SLAVE_BUILD]/src/build/android/provision_devices.py", 285 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
269 "--adb-path", 286 "--adb-path",
270 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 287 "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/a db",
271 "--blacklist-file", 288 "--blacklist-file",
272 "[SLAVE_BUILD]/src/out/bad_devices.json", 289 "[SLAVE_BUILD]/src/out/bad_devices.json",
273 "--output-device-blacklist", 290 "--output-device-blacklist",
274 "/path/to/tmp/json", 291 "/path/to/tmp/json",
275 "-t", 292 "-t",
276 "Release", 293 "Release",
277 "--min-battery-level", 294 "--min-battery-level",
278 "95", 295 "95",
279 "--disable-network", 296 "--disable-network",
280 "--disable-java-debug", 297 "--disable-java-debug",
(...skipping 10 matching lines...) Expand all
291 "@@@STEP_EXCEPTION@@@" 308 "@@@STEP_EXCEPTION@@@"
292 ] 309 ]
293 }, 310 },
294 { 311 {
295 "name": "$result", 312 "name": "$result",
296 "reason": "Infra Failure: Step('provision_devices') returned 1", 313 "reason": "Infra Failure: Step('provision_devices') returned 1",
297 "recipe_result": null, 314 "recipe_result": null,
298 "status_code": 1 315 "status_code": 1
299 } 316 }
300 ] 317 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698