| OLD | NEW | 
|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 from buildbot.schedulers.basic import SingleBranchScheduler | 5 from buildbot.schedulers.basic import SingleBranchScheduler | 
| 6 | 6 | 
| 7 from master.factory import remote_run_factory | 7 from master.factory import remote_run_factory | 
| 8 | 8 | 
| 9 import master_site_config | 9 import master_site_config | 
| 10 ActiveMaster = master_site_config.WebRTC | 10 ActiveMaster = master_site_config.WebRTC | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 27                             builderNames=[ | 27                             builderNames=[ | 
| 28           'Android32 Builder', | 28           'Android32 Builder', | 
| 29           'Android32 Builder (dbg)', | 29           'Android32 Builder (dbg)', | 
| 30           'Android32 Builder x86', | 30           'Android32 Builder x86', | 
| 31           'Android32 Builder x86 (dbg)', | 31           'Android32 Builder x86 (dbg)', | 
| 32           'Android32 Builder MIPS (dbg)', | 32           'Android32 Builder MIPS (dbg)', | 
| 33           'Android32 Clang (dbg)', | 33           'Android32 Clang (dbg)', | 
| 34           'Android64 Builder', | 34           'Android64 Builder', | 
| 35           'Android64 Builder (dbg)', | 35           'Android64 Builder (dbg)', | 
| 36           'Android64 Builder x64 (dbg)', | 36           'Android64 Builder x64 (dbg)', | 
| 37           'Android32 GN', | 37           'Android32 GYP', | 
| 38           'Android32 GN (dbg)', | 38           'Android32 GYP (dbg)', | 
| 39       ]), | 39       ]), | 
| 40   ]) | 40   ]) | 
| 41 | 41 | 
| 42   # 'slavebuilddir' below is used to reduce the number of checkouts since some | 42   # 'slavebuilddir' below is used to reduce the number of checkouts since some | 
| 43   # of the builders are pooled over multiple slave machines. | 43   # of the builders are pooled over multiple slave machines. | 
| 44   specs = [ | 44   specs = [ | 
| 45     {'name': 'Android32 Builder'}, | 45     {'name': 'Android32 Builder'}, | 
| 46     {'name': 'Android32 Builder (dbg)'}, | 46     {'name': 'Android32 Builder (dbg)'}, | 
| 47     {'name': 'Android32 Builder x86', 'slavebuilddir': 'android_x86'}, | 47     {'name': 'Android32 Builder x86', 'slavebuilddir': 'android_x86'}, | 
| 48     {'name': 'Android32 Builder x86 (dbg)', 'slavebuilddir': 'android_x86'}, | 48     {'name': 'Android32 Builder x86 (dbg)', 'slavebuilddir': 'android_x86'}, | 
| 49     {'name': 'Android32 Builder MIPS (dbg)', 'slavebuilddir': 'android_mips'}, | 49     {'name': 'Android32 Builder MIPS (dbg)', 'slavebuilddir': 'android_mips'}, | 
| 50     {'name': 'Android32 Clang (dbg)', 'slavebuilddir': 'android_clang'}, | 50     {'name': 'Android32 Clang (dbg)', 'slavebuilddir': 'android_clang'}, | 
| 51     {'name': 'Android64 Builder', 'slavebuilddir': 'android_arm64'}, | 51     {'name': 'Android64 Builder', 'slavebuilddir': 'android_arm64'}, | 
| 52     {'name': 'Android64 Builder (dbg)', 'slavebuilddir': 'android_arm64'}, | 52     {'name': 'Android64 Builder (dbg)', 'slavebuilddir': 'android_arm64'}, | 
| 53     {'name': 'Android64 Builder x64 (dbg)', 'slavebuilddir': 'android_x64'}, | 53     {'name': 'Android64 Builder x64 (dbg)', 'slavebuilddir': 'android_x64'}, | 
| 54     {'name': 'Android32 GN', 'slavebuilddir': 'android_gn'}, | 54     {'name': 'Android32 GYP', 'slavebuilddir': 'android_gyp'}, | 
| 55     {'name': 'Android32 GN (dbg)', 'slavebuilddir': 'android_gn'}, | 55     {'name': 'Android32 GYP (dbg)', 'slavebuilddir': 'android_gyp'}, | 
| 56     {'name': 'Android32 Tests (L Nexus5)(dbg)'}, | 56     {'name': 'Android32 Tests (L Nexus5)(dbg)'}, | 
| 57     {'name': 'Android32 Tests (L Nexus7.2)(dbg)'}, | 57     {'name': 'Android32 Tests (L Nexus7.2)(dbg)'}, | 
| 58     {'name': 'Android64 Tests (L Nexus9)'}, | 58     {'name': 'Android64 Tests (L Nexus9)'}, | 
| 59     {'name': 'Android32 Tests (L Nexus5)'}, | 59     {'name': 'Android32 Tests (L Nexus5)'}, | 
| 60     {'name': 'Android32 Tests (L Nexus7.2)'}, | 60     {'name': 'Android32 Tests (L Nexus7.2)'}, | 
| 61   ] | 61   ] | 
| 62 | 62 | 
| 63   c['builders'].extend([ | 63   c['builders'].extend([ | 
| 64       { | 64       { | 
| 65         'name': spec['name'], | 65         'name': spec['name'], | 
| 66         'factory': m_remote_run('webrtc/standalone'), | 66         'factory': m_remote_run('webrtc/standalone'), | 
| 67         'notify_on_missing': True, | 67         'notify_on_missing': True, | 
| 68         'category': 'android', | 68         'category': 'android', | 
| 69         'slavebuilddir': spec.get('slavebuilddir', 'android'), | 69         'slavebuilddir': spec.get('slavebuilddir', 'android'), | 
| 70       } for spec in specs | 70       } for spec in specs | 
| 71   ]) | 71   ]) | 
| OLD | NEW | 
|---|