Upload Android test data 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 copy
 import json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import buildbot_report
 
@@ skipping 56 matching lines @@
         WrapWithBash(' '.join(map(pipes.quote, run_test_cmd))), run_test_cmd))
 
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['bb_compile']
   std_build_steps = ['bb_compile', 'bb_zip_build']
   std_test_steps = ['bb_extract_build']
   std_tests = ['ui', 'unit']
+  flakiness_server = '--upload-to-flakiness-server'
 
   B = BotConfig
   def T(tests, extra_args=None):
     return TestConfig(tests, extra_args)
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_run_findbugs',
          'bb_zip_build'], None, None),
       B('main-builder-rel',
         ['bb_compile', 'bb_zip_build'], None, None),
       B('main-clang-builder', compile_step, None, None),
       B('main-clobber', compile_step, None, None),
-      B('main-tests', std_test_steps, T(std_tests), None),
+      B('main-tests', std_test_steps, T(std_tests, [flakiness_server]),
+        None),
 
       # 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('chromedriver-fyi-tests-dbg', std_test_steps, T(['chromedriver']),
         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', '--upload-to-flakiness-server']), None),
+        T(std_tests, ['--experimental', 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-webkit-tests', std_test_steps,
         T(['webkit_layout', 'webkit']), None),
       B('webkit-latest-contentshell', compile_step, T(['webkit_layout']), 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-builder-rel', 'main-builder-rel'),
       ('try-clang-builder', 'main-clang-builder'),
       ('try-fyi-builder-dbg', 'fyi-builder-dbg'),
       ('try-tests', 'main-tests'),
+      ('try-fyi-tests', 'fyi-tests'),
       ('webkit-latest-tests', 'main-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)
+    bot_map[to_id] = copy.deepcopy(bot_map[from_id])._replace(bot_id=to_id)
 
+    # Trybots do not upload to flakiness dashboard. They should be otherwise
+    # identical in configuration to their trunk building counterparts.
+    test_obj = bot_map[to_id].test_obj
+    if to_id.startswith('try') and test_obj:
+      extra_args = test_obj.extra_args
+      if extra_args and flakiness_server in extra_args:
+        extra_args.remove(flakiness_server)

[frankf, 2013/03/20 18:39:40]

I don't think all this logic is justified for removing one parameter. The
general way is to be able to inherit configurations (testers inherit from fyi +
some extra configuration). If that's too much for this CL, having a separate
configuration like before is simpler and more readable.

[Isaac (away), 2013/03/20 18:42:56]

I'm not sure what you mean.  I'm open to other suggestions to how to do this but
I want to explicitly pin the trybot configurations to the main tester
configurations to make sure they don't diverge in the future.

[frankf, 2013/03/20 19:01:32]

This is outside of the scope of this CL, but I think this is going to get
awkward if there's more divergence in the future. Just something to think about
is using inheritance instead of copying/removing things. As an example:

http://git.chromium.org/gitweb/?p=chromiumos/chromite.git;a=blob;f=buildbot/c...

On 2013/03/20 18:42:56, Isaac wrote:

   return bot_map
 
 
 def main(argv):
   parser = optparse.OptionParser()
 
   def ConvertJson(option, _, value, parser):
     setattr(parser.values, option.dest, json.loads(value))
 
   parser.add_option('--build-properties', action='callback',
@@ skipping 54 matching lines @@
           cwd=CHROME_SRC,
           env=dict(os.environ, BUILDBOT_TESTING='1'))
     else:
       return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))