WebRTC: Move Android bots with devices to the perf waterfall.

masters/master.client.webrtc/master_android_cfg.py

 # Copyright 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.
 
 from buildbot.schedulers.basic import SingleBranchScheduler
 
 from master.factory import remote_run_factory
 
 import master_site_config
 ActiveMaster = master_site_config.WebRTC
 
 
 def m_remote_run(recipe, **kwargs):
   return remote_run_factory.RemoteRunFactory(
       active_master=ActiveMaster,
       repository='https://chromium.googlesource.com/chromium/tools/build.git',
       recipe=recipe,
       factory_properties={'path_config': 'kitchen'},
       **kwargs)
 
 
 def Update(c):
   c['schedulers'].extend([
       SingleBranchScheduler(name='webrtc_android_scheduler',
                             branch='master',
                             treeStableTimer=30,
                             builderNames=[
-          'Android32 Builder',
-          'Android32 Builder (dbg)',
           'Android32 Builder x86',
           'Android32 Builder x86 (dbg)',
           'Android32 Builder MIPS (dbg)',
           'Android32 Clang (dbg)',
-          'Android64 Builder',
-          'Android64 Builder (dbg)',
           'Android64 Builder x64 (dbg)',
           'Android32 GYP',
           'Android32 GYP (dbg)',
       ]),
   ])
 
   # 'slavebuilddir' below is used to reduce the number of checkouts since some
   # of the builders are pooled over multiple slave machines.
   specs = [
-    {'name': 'Android32 Builder', 'slavebuilddir': 'android_arm32'},
-    {'name': 'Android32 Builder (dbg)', 'slavebuilddir': 'android_arm32'},
     {'name': 'Android32 Builder x86', 'slavebuilddir': 'android_x86'},
     {'name': 'Android32 Builder x86 (dbg)', 'slavebuilddir': 'android_x86'},
     {'name': 'Android32 Builder MIPS (dbg)', 'slavebuilddir': 'android_mips'},
     {'name': 'Android32 Clang (dbg)', 'slavebuilddir': 'android_clang'},
-    {'name': 'Android64 Builder', 'slavebuilddir': 'android_arm64'},
-    {'name': 'Android64 Builder (dbg)', 'slavebuilddir': 'android_arm64'},
     {'name': 'Android64 Builder x64 (dbg)', 'slavebuilddir': 'android_x64'},
     {'name': 'Android32 GYP', 'slavebuilddir': 'android_gyp'},
     {'name': 'Android32 GYP (dbg)', 'slavebuilddir': 'android_gyp'},
-    {'name': 'Android32 Tests (L Nexus5)(dbg)'},
-    {'name': 'Android32 Tests (L Nexus7.2)(dbg)'},
     {
       'name': 'Android32 Tests (M Nexus5X)(dbg)',

[kjellander_chromium, 2016/10/07 07:07:15]

I suggest we remove 'Tests' from the name now that they're builder_tester type.
We'll loose the build history for these, but since they're completely new that's
fine.
I'm not sure if we should migrate any of the old build for Android Tests bots
into these, but since that'll be too annoying and since the logs are already
archived in logdog, I don't think it's worth the effort.

[ehmaldonado_chromium, 2016/10/07 08:26:30]

Ok. Let's do that in another CL :)

[kjellander_chromium, 2016/10/07 12:27:40]

I realize I wasn't very clear: I meant I want the rename to happen now - better
do it now than later/never before we've had too many builds.

What I meant we can ignore is the fact that we'll loose all the build history
from the other Android testers.
We could have (locally on the master) moved all the logs from, let's say
'Android32 Tests (L Nexus5)' into the directory of 'Android32 (M Nexus5X)' but
that'd add a lot of confusion, so let's not bother doing that.

       'slavebuilddir': 'android_arm32',
     },
-    {'name': 'Android32 Tests (L Nexus5)'},
-    {'name': 'Android32 Tests (L Nexus7.2)'},
     {
       'name': 'Android32 Tests (M Nexus5X)',
       'slavebuilddir': 'android_arm32',
     },
-    {'name': 'Android64 Tests (L Nexus9)'},
     {
       'name': 'Android64 Tests (M Nexus5X)(dbg)',
       'slavebuilddir': 'android_arm64',
     },
     {
       'name': 'Android64 Tests (M Nexus5X)',
-      'slavebuilddir': 'android_arm32',
+      'slavebuilddir': 'android_arm64',
     },
   ]
 
   c['builders'].extend([
       {
         'name': spec['name'],
         'factory': m_remote_run('webrtc/standalone'),
         'notify_on_missing': True,
         'category': 'android',
         'slavebuilddir': spec.get('slavebuilddir', 'android'),
       } for spec in specs
   ])