[Android] Add bot id for an x86 fyi and try builders

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 os
@@ skipping 27 matching lines @@
       diff.append('+ %s=%s' % (key, pipes.quote(d2[key])))
   return '\n'.join(diff)
 
 
 def GetEnvironment(host_obj, testing):
   init_env = dict(os.environ)
   init_env['GYP_GENERATORS'] = 'ninja'
   init_env['GOMA_DIR'] = bb_utils.GOMA_DIR
   envsetup_cmd = '. build/android/envsetup.sh'
   if host_obj.target_arch:
-    envsetup_cmd += ' --target_arch=%s' % host_obj.target_arch
+    envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch
   if testing:
     # Skip envsetup to avoid presubmit dependence on android deps.
     print 'Testing mode - skipping "%s"' % envsetup_cmd
     envsetup_cmd = ':'
   else:
     print 'Running %s' % envsetup_cmd
   proc = subprocess.Popen(['bash', '-exc',
     envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'],
     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
     cwd=bb_utils.CHROME_SRC, env=init_env)
@@ skipping 46 matching lines @@
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['compile']
   std_host_tests = ['check_webview_licenses', 'findbugs']
   std_build_steps = ['compile', 'zip_build']
   std_test_steps = ['extract_build']
   std_tests = ['ui', 'unit']
   flakiness_server = '--upload-to-flakiness-server'
+  experimental = ['--experimental']
 
   B = BotConfig
   H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None :
        HostConfig('build/android/buildbot/bb_host_steps.py', steps, extra_args,
                   extra_gyp, target_arch))
   T = (lambda tests, extra_args=None :
        TestConfig('build/android/buildbot/bb_device_steps.py', tests,
                   extra_args))
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg', H(std_build_steps + std_host_tests)),
       B('main-builder-rel', H(std_build_steps)),
       B('main-clang-builder',
         H(compile_step, extra_gyp='clang=1 component=shared_library')),
       B('main-clobber', H(compile_step)),
       B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])),
 
       # Other waterfalls
       B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'),
         T(std_tests, ['--asan'])),
       B('chromedriver-fyi-tests-dbg', H(std_test_steps),
         T(['chromedriver'], ['--install=ChromiumTestShell'])),
+      B('fyi-x86-builder-dbg',
+        H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
-        H(std_build_steps + std_host_tests, ['--experimental'])),
-      B('fyi-builder-rel', H(std_build_steps,  ['--experimental'])),
-      B('fyi-tests-dbg-ics-gn', H(compile_step, [ '--experimental']),
-        T(std_tests, ['--experimental', flakiness_server])),
+        H(std_build_steps + std_host_tests, experimental)),
+      B('x86-builder-dbg',
+        H(compile_step + std_host_tests, target_arch='x86')),
+      B('fyi-builder-rel', H(std_build_steps,  experimental)),
       B('fyi-tests', H(std_test_steps),
         T(std_tests, ['--experimental', flakiness_server])),
       B('fyi-component-builder-tests-dbg',
         H(compile_step, extra_gyp='component=shared_library'),
         T(std_tests, ['--experimental', flakiness_server])),
       B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])),
       B('perf-tests-rel', H(std_test_steps),
         T([], ['--install=ChromiumTestShell'])),
       B('webkit-latest-webkit-tests', H(std_test_steps),
         T(['webkit_layout', 'webkit'])),
       B('webkit-latest-contentshell', H(compile_step), T(['webkit_layout'])),
       B('builder-unit-tests', H(compile_step), T(['unit'])),
 
       # Generic builder config (for substring match).
       B('builder', H(std_build_steps)),
   ]
 
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('lkgr-clobber', 'main-clobber'),
       ('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-x86-builder-dbg', 'x86-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] = copy.deepcopy(bot_map[from_id])._replace(bot_id=to_id)
 
     # Trybots do not upload to flakiness dashboard. They should be otherwise
@@ skipping 61 matching lines @@
     sys.stdout.flush()
     if options.testing:
       env['BUILDBOT_TESTING'] = '1'
     return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))