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

masters/master.client.webrtc/master_android_cfg.py

Index: masters/master.client.webrtc/master_android_cfg.py
diff --git a/masters/master.client.webrtc/master_android_cfg.py b/masters/master.client.webrtc/master_android_cfg.py
index 82ebd8f585411289d98ac4e4109992feb6b40d09..fff4bfcd9773e0446c4cfb5beb75618a07abce58 100644
--- a/masters/master.client.webrtc/master_android_cfg.py
+++ b/masters/master.client.webrtc/master_android_cfg.py
@@ -25,14 +25,10 @@ def Update(c):
                             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)',
@@ -42,37 +38,28 @@ def Update(c):
   # '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',
     },
   ]