Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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.scheduler import Scheduler | 5 from buildbot.scheduler import Scheduler |
| 6 | 6 |
| 7 # These modules come from scripts/master, which must be in the PYTHONPATH. | 7 # These modules come from scripts/master, which must be in the PYTHONPATH. |
| 8 from master import gitiles_poller | 8 from master import gitiles_poller |
| 9 from master import master_utils | 9 from master import master_utils |
| 10 from master import slaves_list | 10 from master import slaves_list |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 'builddir': 'google-chrome-rel-linux', | 87 'builddir': 'google-chrome-rel-linux', |
| 88 'factory': m_annotator.BaseFactory('chromium'), | 88 'factory': m_annotator.BaseFactory('chromium'), |
| 89 'notify_on_missing': True, | 89 'notify_on_missing': True, |
| 90 } | 90 } |
| 91 | 91 |
| 92 # Please contact chrome-re before changing this _google_chrome_rel builder | 92 # Please contact chrome-re before changing this _google_chrome_rel builder |
| 93 # Please keep master.chromium.perf in sync with this | 93 # Please keep master.chromium.perf in sync with this |
| 94 b_google_chrome_rel_linux_64 = { | 94 b_google_chrome_rel_linux_64 = { |
| 95 'name': 'Google Chrome Linux x64', | 95 'name': 'Google Chrome Linux x64', |
| 96 'builddir': 'google-chrome-rel-linux_64', | 96 'builddir': 'google-chrome-rel-linux_64', |
| 97 'factory': m_annotator.BaseFactory('chromium', timeout=3600), | 97 'factory': m_annotator.BaseFactory('chromium', timeout=4800), |
|
Alexander Potapenko
2015/12/15 17:40:13
I'm guessing this is a temporary solution. Can you
krasin
2015/12/15 17:49:56
Done.
| |
| 98 'notify_on_missing': True, | 98 'notify_on_missing': True, |
| 99 } | 99 } |
| 100 | 100 |
| 101 # Please contact chrome-re before changing this _google_chrome_rel builder | 101 # Please contact chrome-re before changing this _google_chrome_rel builder |
| 102 # Please keep master.chromium.perf in sync with this | 102 # Please keep master.chromium.perf in sync with this |
| 103 b_google_chrome_rel_mac = { | 103 b_google_chrome_rel_mac = { |
| 104 'name': 'Google Chrome Mac', | 104 'name': 'Google Chrome Mac', |
| 105 'builddir': 'google-chrome-rel-mac', | 105 'builddir': 'google-chrome-rel-mac', |
| 106 'factory': m_annotator.BaseFactory('chromium', timeout=2400), | 106 'factory': m_annotator.BaseFactory('chromium', timeout=2400), |
| 107 'notify_on_missing': True, | 107 'notify_on_missing': True, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 # Buildbot master url: | 148 # Buildbot master url: |
| 149 # Must come before AutoSetupMaster(). | 149 # Must come before AutoSetupMaster(). |
| 150 c['buildbotURL'] = ActiveMaster.buildbot_url | 150 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 151 | 151 |
| 152 # Adds common status and tools to this master. | 152 # Adds common status and tools to this master. |
| 153 master_utils.AutoSetupMaster(c, ActiveMaster, | 153 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 154 public_html='../master.chromium/public_html', | 154 public_html='../master.chromium/public_html', |
| 155 templates=['../master.chromium/templates'], | 155 templates=['../master.chromium/templates'], |
| 156 tagComparator=master_poller.comparator, | 156 tagComparator=master_poller.comparator, |
| 157 enable_http_status_push=ActiveMaster.is_production_host) | 157 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |