Add 2 config names for builder 'Blimp Android Tester'

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     'chromeos.chrome': {
@@ skipping 65 matching lines @@
       'Afl Upload Linux ASan': 'release_afl_asan',
       'Android Cloud Tests': 'android_debug_static_bot_x86',
       'Android Tests (x86 emulator)': 'android_debug_static_bot_x86',
       'Android Builder (dbg)': 'android_debug_static_bot_vr_shell',
       'Android deterministic': 'android_without_codecs_release_bot_minimal_symbols',
       'Android deterministic (dbg)': 'android_debug_bot',
       'Blimp Android Client':
         '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
       'Blimp Linux Engine':
         '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+      'Blimp Client Engine Integration': {
+        'client': 'blimp_chromium_fyi_android_client',

[jbudorick, 2016/10/07 19:22:01]

Can these two just directly reference the files?

[Dirk Pranke, 2016/10/07 19:25:29]

Oh, I missed that :(.

I'd be surprised if this even works. I'd expect that if you want to use a file,
you might *have* to list it directly here, like we do in the single-config case.

[shenghuazhang, 2016/10/08 00:21:18]

Oh I see. Will replace the configs with the direct file path.

+        'engine': 'blimp_chromium_fyi_linux_engine',
+      },
       'Browser Side Navigation Linux': 'release_bot',
       'CFI Linux CF': 'cfi_full_cfi_diag_release_static',
       'CFI Linux ToT': 'cfi_full_clang_tot_release_static',
       'CFI Linux': 'cfi_release_static',
       'CFI Linux Full': 'cfi_full_release_static',
       'Chromium Linux Goma Canary': 'release_bot',
       'Chromium Linux Goma Canary (clobber)': 'release_bot',
       'Chromium Linux Precise Goma LinkTest': 'release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_release_bot',
@@ skipping 527 matching lines @@
       'win_chromium_syzyasan_rel': 'syzyasan_no_pch_release_x86',
       'win_chromium_x64_rel_ng': 'release_trybot',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'clang_debug_trybot_x86',
       'win_clang_rel': 'clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'clang_official_release_trybot',
       'win_nacl_sdk': 'release_bot_x86',
       'win_nacl_sdk_build': 'release_bot_x86',
       'win_optional_gpu_tests_rel': 'gpu_tests_deqp_gles_release_trybot_x86',
-      'win_pgo': [ 'official_optimize_chrome_pgo_phase_1_x86', 'official_optimize_chrome_pgo_phase_2_x86' ],
+      'win_pgo': {
+        'pgo_phase_1': 'official_optimize_chrome_pgo_phase_1_x86',
+        'pgo_phase_2': 'official_optimize_chrome_pgo_phase_2_x86',

[Dirk Pranke, 2016/10/07 19:01:59]

There's also a PGO builder on the official.desktop master (line 402), and
unfortunately that one needs to build across trunk/beta/stable, and the recipe
for it isn't pinned. In other words, we can't easily change the command line it
passes to MB.

I think things will still work if we just change the keys to '0' and '1'; they
aren't good names, but it'll get the job done and we can worry about changing
the names later.

Does that make sense?

[shenghuazhang, 2016/10/08 00:21:18]

Yeah, I think change keys to '0' and '1' is a good way for now (if that works),
since things are not as simple as just change the command line in the mb config
here.

[Dirk Pranke, 2016/10/11 00:14:05]

Ah, sorry, I was wrong about this. The PGO builders are passing in '1' and '2',
not '0' and '1'; the indexes are 1-based, because I thought 0-based looked
stupid at the time :).

+      },
       'win_upload_clang': 'release_bot',
       'win_chrome_official': 'official_goma_x86',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_debug_bot',
       'v8_linux_blink_rel': 'release_trybot',
       'v8_linux_chromium_gn_rel': 'release_trybot',
     },
   },
@@ skipping 246 matching lines @@
     ],
 
     'asan_lsan_release_bot': [
       'asan', 'lsan', 'release_bot',
     ],
 
     'asan_lsan_release_trybot': [
       'asan', 'lsan', 'release_trybot',
     ],
 
+    'blimp_chromium_fyi_android_client': [
+      'blimp_client_rel'
+    ],
+
+    'blimp_chromium_fyi_linux_engine': [
+      'blimp_engine_rel'
+    ],
+
     'cast_release_bot': [
       'cast', 'release_bot',
     ],
 
     'cast_release_trybot': [
       'cast', 'release_trybot',
     ],
 
     'cfi_full_cfi_diag_release_static': [
       'cfi_full', 'cfi_diag', 'release', 'static',
@@ skipping 534 matching lines @@
     },
 
     'asan': {
       'gn_args': 'is_asan=true',
     },
 
     'blink_logging': {
       'gn_args': 'blink_logging_always_on=true',
     },
 
+    'blimp_client_rel': {
+       'gn_args': '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
+    },
+
+    'blimp_engine_rel': {
+       'gn_args': '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+    },
+
     'ffmpeg_branding_chrome': {
       'gn_args': 'ffmpeg_branding="Chrome"',
     },
 
     'ffmpeg_branding_chromeos': {
       'gn_args': 'ffmpeg_branding="ChromeOS"',
     },
 
     'cast': {
       'gn_args': 'is_chromecast=true',
@@ skipping 310 matching lines @@
       'gn_args': 'target_cpu="x86"',
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
     },
   },
 }