| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 # This is the buildmaster config file for the 'nacl' bot. It must | 8 # This is the buildmaster config file for the 'nacl' bot. It must |
| 9 # be installed as 'master.cfg' in your buildmaster's base directory | 9 # be installed as 'master.cfg' in your buildmaster's base directory |
| 10 # (although the filename can be changed with the --basedir option to | 10 # (although the filename can be changed with the --basedir option to |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 import config | 30 import config |
| 31 import master_site_config | 31 import master_site_config |
| 32 | 32 |
| 33 ActiveMaster = master_site_config.NativeClientSDK | 33 ActiveMaster = master_site_config.NativeClientSDK |
| 34 | 34 |
| 35 # This is the dictionary that the buildmaster pays attention to. We also use | 35 # This is the dictionary that the buildmaster pays attention to. We also use |
| 36 # a shorter alias to save typing. | 36 # a shorter alias to save typing. |
| 37 c = BuildmasterConfig = {} | 37 c = BuildmasterConfig = {} |
| 38 | 38 |
| 39 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 39 config.DatabaseSetup(c) |
| 40 | 40 |
| 41 ####### CHANGESOURCES | 41 ####### CHANGESOURCES |
| 42 | 42 |
| 43 def ChromiumNativeClientChangeFilter(commit_json, branch): | 43 def ChromiumNativeClientChangeFilter(commit_json, branch): |
| 44 if 'tree_diff' not in commit_json: | 44 if 'tree_diff' not in commit_json: |
| 45 return False | 45 return False |
| 46 for diff_entry in commit_json['tree_diff']: | 46 for diff_entry in commit_json['tree_diff']: |
| 47 path = diff_entry['new_path'] | 47 path = diff_entry['new_path'] |
| 48 if (path == 'DEPS' or | 48 if (path == 'DEPS' or |
| 49 path.startswith('native_client_sdk/') or | 49 path.startswith('native_client_sdk/') or |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 # Must come before AutoSetupMaster(). | 216 # Must come before AutoSetupMaster(). |
| 217 c['buildbotURL'] = ActiveMaster.buildbot_url | 217 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 218 | 218 |
| 219 # Adds common status and tools to this master. | 219 # Adds common status and tools to this master. |
| 220 master_utils.AutoSetupMaster(c, ActiveMaster, | 220 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 221 order_console_by_time=True, | 221 order_console_by_time=True, |
| 222 tagComparator=multi_poller.comparator, | 222 tagComparator=multi_poller.comparator, |
| 223 public_html='../master.chromium/public_html', | 223 public_html='../master.chromium/public_html', |
| 224 templates=['./templates', | 224 templates=['./templates', |
| 225 '../master.client.nacl/templates']) | 225 '../master.client.nacl/templates']) |
| OLD | NEW |