[Android] Upload instrumentation results to flakiness dashboard.

Upload to the staging server and only on the FYI bot.

BUG=150801
TEST=bb_run_bot_test.py

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@177186 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_device_steps.py

@@ -168,6 +168,9 @@ def RunInstrumentationSuite(options, test):
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
+  if options.upload_to_flakiness_server:
+    args.append('--flakiness-dashboard-server='
+                'chrome-android-staging-results.appspot.com')
 
   RunCmd(['build/android/run_instrumentation_tests.py'] + args)
 
@@ -279,6 +282,8 @@ def main(argv):
                     help='Install an apk by name')
   parser.add_option('--reboot', action='store_true',
                     help='Reboot devices before running tests')
+  parser.add_option('--upload-to-flakiness-server', action='store_true',
+                    help='Upload the results to the flakiness dashboard.')
   options, args = parser.parse_args(argv[1:])
 
   def ParserError(msg):

android/buildbot/bb_run_bot.py

@@ -94,9 +94,12 @@ def GetBotStepMap():
          'bb_run_findbugs', 'bb_zip_build'], None, None),
       B('fyi-builder-rel',
         ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None),
-      B('fyi-tests', std_test_steps, T(std_tests, ['--experimental']), None),
+      B('fyi-tests', std_test_steps,
+        T(std_tests, ['--experimental', '--upload-to-flakiness-server']), None),
       B('perf-tests-rel', std_test_steps, T([], ['--install=ContentShell']),
         None),
+      B('try-fyi-tests', std_test_steps, T(std_tests, ['--experimental']),
+        None),
       B('webkit-latest-tests', std_test_steps, T(['unit']), None),
       B('webkit-latest-webkit-tests', std_test_steps,
         T(['webkit_layout', 'webkit']), None),
@@ -113,7 +116,6 @@ def GetBotStepMap():
       ('try-tests-dbg', 'main-tests-dbg'),
       ('try-clang-builder', 'main-clang-builder'),
       ('try-fyi-builder-dbg', 'fyi-builder-dbg'),
-      ('try-fyi-tests', 'fyi-tests'),
   ]
   for to_id, from_id in copy_map:
     assert to_id not in bot_map