| Index: build/android/buildbot/bb_device_steps.py
|
| diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
|
| index 4a659257fb1df221a6d9d3e94832a64948e4bcba..15df49041cdfcaab6e1d3df966cf0ba954ad9cd8 100755
|
| --- a/build/android/buildbot/bb_device_steps.py
|
| +++ b/build/android/buildbot/bb_device_steps.py
|
| @@ -71,7 +71,6 @@ def RebootDeviceSafe(device):
|
|
|
| def RebootDevices():
|
| """Reboot all attached and online devices."""
|
| - buildbot_report.PrintNamedStep('Reboot devices')
|
| # Early return here to avoid presubmit dependence on adb,
|
| # which might not exist in this checkout.
|
| if bb_utils.TESTING:
|
| @@ -234,18 +233,16 @@ def MainTestWrapper(options):
|
| # Wait for logcat_monitor to pull existing logcat
|
| RunCmd(['sleep', '5'])
|
|
|
| + # Provision devices
|
| + buildbot_report.PrintNamedStep('provision_devices')
|
| if options.reboot:
|
| RebootDevices()
|
| + RunCmd(['build/android/provision_devices.py', '-t', options.target])
|
|
|
| # Device check and alert emails
|
| buildbot_report.PrintNamedStep('device_status_check')
|
| RunCmd(['build/android/device_status_check.py'], halt_on_failure=True)
|
|
|
| - # Provision devices
|
| - buildbot_report.PrintNamedStep('provision_devices')
|
| - target = options.factory_properties.get('target', 'Debug')
|
| - RunCmd(['build/android/provision_devices.py', '-t', target])
|
| -
|
| if options.install:
|
| test_obj = INSTRUMENTATION_TESTS[options.install]
|
| InstallApk(options, test_obj, print_step=True)
|
|
|