S3 devices should not be rebooted in provision step.

Rebooting s3 devices causes device to be flaky during the deploy step. This is
likely because WaitForPackageManager() does not wait long enough on the s3
devices. I've verified locally on the bot that without the reboot in the
provision step, the devices are more reliable (i.e. deploy step passes).

BUG=321063
TBR=frankf@chromium.org

Review URL: https://codereview.chromium.org/122313008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243542 0039d316-1c4b-4281-b951-d872f2087c98

build/android/buildbot/bb_device_steps.py

@@ -402,7 +402,7 @@ def ProvisionDevices(options):
     adb.RestartAdbServer()
     RunCmd(['sleep', '1'])
 
-  if options.reboot:
+  if not options.no_reboot:
     RebootDevices()
   provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
   if options.auto_reconnect:
@@ -584,8 +584,8 @@ def GetDeviceStepsOptParser():
   parser.add_option('--asan', action='store_true', help='Run tests with asan.')
   parser.add_option('--install', metavar='<apk name>',
                     help='Install an apk by name')
-  parser.add_option('--reboot', action='store_true',
-                    help='Reboot devices before running tests')
+  parser.add_option('--no-reboot', action='store_true',
+                    help='Do not reboot devices during provisioning.')
   parser.add_option('--coverage-bucket',
                     help=('Bucket name to store coverage results. Coverage is '
                           'only run if this is set.'))

build/android/buildbot/bb_run_bot.py

@@ -104,7 +104,7 @@ def GetCommands(options, bot_config):
 
   test_obj = bot_config.test_obj
   if test_obj:
-    run_test_cmd = [test_obj.script, '--reboot'] + property_args
+    run_test_cmd = [test_obj.script] + property_args
     for test in test_obj.tests:
       run_test_cmd.extend(['-f', test])
     if test_obj.extra_args: