[Android] Upload instrumentation results to flakiness dashboard.

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 import collections
 import json
 import optparse
 import os
@@ skipping 76 matching lines @@
 
       # Other waterfalls
       B('asan-builder', std_build_steps, None, None),
       B('asan-tests', std_test_steps + ['bb_asan_tests_setup'],
         T(std_tests, ['--asan']), None),
       B('fyi-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental',
          '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),
 
       # Generic builder config (for substring match).
       B('builder', std_build_steps, None, None),
   ]
 
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('try-builder-dbg', 'main-builder-dbg'),
       ('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
     # pylint: disable=W0212
     bot_map[to_id] = bot_map[from_id]._replace(bot_id=to_id)
 
   return bot_map
 
 
 def main(argv):
@@ skipping 59 matching lines @@
         continue
       env = dict(os.environ)
       env['BUILDBOT_TESTING'] = '1'
 
     return_code |= subprocess.call(command, cwd=CHROME_SRC, env=env)
   return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))