Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: masters/master.tryserver.chromium.win/master.cfg

Issue 2156443003: tryserver.chromium.win: convert chromium_trybot builders to remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: presubmit Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # ex: set syntax=python: 2 # ex: set syntax=python:
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # READ THIS: 7 # READ THIS:
8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure 8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
9 9
10 import os 10 import os
11 import socket 11 import socket
12 12
13 from buildbot.scheduler import Triggerable 13 from buildbot.scheduler import Triggerable
14 14
15 # These modules come from scripts, which must be in the PYTHONPATH. 15 # These modules come from scripts, which must be in the PYTHONPATH.
16 from master import master_utils 16 from master import master_utils
17 from master import slaves_list 17 from master import slaves_list
18 from master.builders_pools import BuildersPools 18 from master.builders_pools import BuildersPools
19 from master.factory import annotator_factory 19 from master.factory import annotator_factory
20 from master.factory import remote_run_factory
20 from master.try_job_http import TryJobHTTP 21 from master.try_job_http import TryJobHTTP
21 from master.try_job_svn import TryJobSubversion 22 from master.try_job_svn import TryJobSubversion
22 23
23 import config 24 import config
24 import master_site_config 25 import master_site_config
25 26
26 ActiveMaster = master_site_config.TryServerChromiumWin 27 ActiveMaster = master_site_config.TryServerChromiumWin
27 28
28 29
29 MAIL_NOTIFIER = ActiveMaster.is_production_host 30 MAIL_NOTIFIER = ActiveMaster.is_production_host
(...skipping 22 matching lines...) Expand all
52 53
53 chromium_builders = [] 54 chromium_builders = []
54 55
55 def baseFactory(recipe, factory_properties=None, **kwargs): 56 def baseFactory(recipe, factory_properties=None, **kwargs):
56 fp = factory_properties or {} 57 fp = factory_properties or {}
57 fp.update({ 58 fp.update({
58 '$recipe_engine': {'mode_flags': {'use_subprocess42': True}} 59 '$recipe_engine': {'mode_flags': {'use_subprocess42': True}}
59 }) 60 })
60 return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs) 61 return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
61 62
63
64 def m_remote_run(recipe, **kwargs):
65 return remote_run_factory.RemoteRunFactory(
66 active_master=ActiveMaster,
67 repository='https://chromium.googlesource.com/chromium/tools/build.git',
68 recipe=recipe,
69 factory_properties={'path_config': 'kitchen'},
70 **kwargs)
71
72
62 for targ in ('_rel', '_dbg'): 73 for targ in ('_rel', '_dbg'):
63 chromium_builders.extend([{ 74 chromium_builders.extend([{
64 'name': 'win_chromium%s_ng' % targ, 75 'name': 'win_chromium%s_ng' % targ,
65 'factory': baseFactory( 76 'factory': m_remote_run(
66 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN), 77 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
67 # Share build directory with compatible existing builders to save space. 78 'slavebuilddir': 'remote_run'
68 'slavebuilddir': 'win'
69 }, { 79 }, {
70 'name': 'win_chromium_compile%s_ng' % targ, 80 'name': 'win_chromium_compile%s_ng' % targ,
71 'factory': baseFactory( 81 'factory': m_remote_run(
72 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN), 82 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
73 # Share build directory with compatible existing builders to save space. 83 'slavebuilddir': 'remote_run'
74 'slavebuilddir': 'win'
75 }]) 84 }])
76 85
77 chromium_builders.append({ 86 chromium_builders.append({
78 'name': 'win10_chromium_x64_rel_ng', 87 'name': 'win10_chromium_x64_rel_ng',
79 'factory': baseFactory('chromium_trybot', timeout=3600), 88 'factory': m_remote_run('chromium_trybot', timeout=3600),
80 # Share build directory with compatible existing builders to save space. 89 'slavebuilddir': 'remote_run',
81 'slavebuilddir': 'win',
82 }) 90 })
83 91
84 chromium_builders.append({ 92 chromium_builders.append({
85 'name': 'win10_chromium_x64_rel_ng_exp', 93 'name': 'win10_chromium_x64_rel_ng_exp',
86 'factory': baseFactory('chromium_trybot', timeout=3600), 94 'factory': m_remote_run('chromium_trybot', timeout=3600),
87 # Share build directory with compatible existing builders to save space. 95 'slavebuilddir': 'remote_run',
88 'slavebuilddir': 'win',
89 }) 96 })
90 97
91 chromium_builders.append({ 98 chromium_builders.append({
92 'name': 'win_archive', 99 'name': 'win_archive',
93 'factory': baseFactory('chromium_trybot', timeout=3600), 100 'factory': m_remote_run('chromium_trybot', timeout=3600),
101 'slavebuilddir': 'remote_run',
94 }) 102 })
95 103
96 chromium_builders.append({ 104 chromium_builders.append({
97 'name': 'win_x64_archive', 105 'name': 'win_x64_archive',
98 'factory': baseFactory('chromium_trybot', timeout=3600), 106 'factory': m_remote_run('chromium_trybot', timeout=3600),
107 'slavebuilddir': 'remote_run',
99 }) 108 })
100 109
101 chromium_builders.append({ 110 chromium_builders.append({
102 'name': 'win_chromium_x64_rel_ng', 111 'name': 'win_chromium_x64_rel_ng',
103 'factory': baseFactory( 112 'factory': m_remote_run(
104 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN), 113 'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
105 # Share build directory with compatible existing builders to save space. 114 'slavebuilddir': 'remote_run'
106 'slavebuilddir': 'win'
107 }) 115 })
108 116
109 chromium_builders.extend([{ 117 chromium_builders.extend([{
110 'name': 'win8_chromium_gyp_rel', 118 'name': 'win8_chromium_gyp_rel',
111 'factory': baseFactory('chromium_trybot'), 119 'factory': m_remote_run('chromium_trybot'),
112 'slavebuilddir': 'win_gyp', 120 'slavebuilddir': 'remote_run',
113 },{ 121 },{
114 'name': 'win8_chromium_gyp_dbg', 122 'name': 'win8_chromium_gyp_dbg',
115 'factory': baseFactory('chromium_trybot'), 123 'factory': m_remote_run('chromium_trybot'),
116 'slavebuilddir': 'win_gyp', 124 'slavebuilddir': 'remote_run',
117 },{ 125 },{
118 'name': 'win8_chromium_gn_upload', 126 'name': 'win8_chromium_gn_upload',
119 'factory': baseFactory('chromium_gn_upload'), 127 'factory': baseFactory('chromium_gn_upload'),
120 'slavebuilddir': 'win_gn', 128 'slavebuilddir': 'win_gn',
121 }, 129 },
122 ]) 130 ])
123 131
124 chromium_builders.append({ 132 chromium_builders.append({
125 'name': 'win_upload_clang', 133 'name': 'win_upload_clang',
126 'factory': baseFactory('chromium_upload_clang'), 134 'factory': baseFactory('chromium_upload_clang'),
127 'slavebuilddir': 'win_upload_clang', 135 'slavebuilddir': 'win_upload_clang',
128 }) 136 })
129 137
130 chromium_builders.append({ 138 chromium_builders.append({
131 'name': 'win_pgo', 139 'name': 'win_pgo',
132 'factory': baseFactory('chromium_pgo', timeout=24000), 140 'factory': baseFactory('chromium_pgo', timeout=24000),
133 'slavebuilddir': 'win', 141 'slavebuilddir': 'win',
134 }) 142 })
135 143
136 chromium_builders.append({ 144 chromium_builders.append({
137 'name': 'win_chrome_official', 145 'name': 'win_chrome_official',
138 'factory': baseFactory('chromium', timeout=4800), 146 'factory': m_remote_run('chromium_trybot', timeout=4800),
139 'slavebuilddir': 'win_chrome', 147 'slavebuilddir': 'remote_run',
140 }) 148 })
141 149
142 chromium_builders.append({ 150 chromium_builders.append({
143 'name': 'win_chromium_syzyasan_rel', 151 'name': 'win_chromium_syzyasan_rel',
144 'factory': baseFactory('chromium_trybot'), 152 'factory': m_remote_run('chromium_trybot'),
145 'slavebuilddir': 'win', 153 'slavebuilddir': 'remote_run',
146 }) 154 })
147 155
148 # Experimental clang/win bots 156 # Experimental clang/win bots
149 chromium_builders.append({ 157 chromium_builders.append({
150 'name': 'win_clang', 158 'name': 'win_clang',
151 'factory': baseFactory('chromium_trybot'), 159 'factory': m_remote_run('chromium_trybot'),
152 'slavebuilddir': 'win_clang', 160 'slavebuilddir': 'remote_run',
153 }) 161 })
154 chromium_builders.append({ 162 chromium_builders.append({
155 'name': 'win_clang_dbg', 163 'name': 'win_clang_dbg',
156 'factory': baseFactory('chromium_trybot'), 164 'factory': m_remote_run('chromium_trybot'),
157 'slavebuilddir': 'win_clang', 165 'slavebuilddir': 'remote_run',
158 }) 166 })
159 chromium_builders.append({ 167 chromium_builders.append({
160 'name': 'win_clang_rel', 168 'name': 'win_clang_rel',
161 'factory': baseFactory('chromium_trybot'), 169 'factory': m_remote_run('chromium_trybot'),
162 'slavebuilddir': 'win_clang', 170 'slavebuilddir': 'remote_run',
163 }) 171 })
164 chromium_builders.append({ 172 chromium_builders.append({
165 'name': 'win_clang_x64_dbg', 173 'name': 'win_clang_x64_dbg',
166 'factory': baseFactory('chromium_trybot'), 174 'factory': m_remote_run('chromium_trybot'),
167 'slavebuilddir': 'win_clang', 175 'slavebuilddir': 'remote_run',
168 }) 176 })
169 chromium_builders.append({ 177 chromium_builders.append({
170 'name': 'win_clang_x64_rel', 178 'name': 'win_clang_x64_rel',
171 'factory': baseFactory('chromium_trybot'), 179 'factory': m_remote_run('chromium_trybot'),
172 'slavebuilddir': 'win_clang', 180 'slavebuilddir': 'remote_run',
173 }) 181 })
174 182
175 # Optional GPU tryserver. 183 # Optional GPU tryserver.
176 chromium_builders.append({ 184 chromium_builders.append({
177 'name': 'win_optional_gpu_tests_rel', 185 'name': 'win_optional_gpu_tests_rel',
178 'factory': baseFactory('chromium_trybot', timeout=3600), 186 'factory': m_remote_run('chromium_trybot', timeout=3600),
179 # Share build directory with compatible existing builders to save space. 187 'slavebuilddir': 'remote_run'
180 'slavebuilddir': 'win'
181 }) 188 })
182 189
183 # NaCl SDK try bots 190 # NaCl SDK try bots
184 b_win_nacl_sdk = { 191 b_win_nacl_sdk = {
185 'name': 'win_nacl_sdk', 192 'name': 'win_nacl_sdk',
186 'factory': baseFactory('nacl/sdk'), 193 'factory': baseFactory('nacl/sdk'),
187 } 194 }
188 195
189 # NaCl SDK build-only try bots 196 # NaCl SDK build-only try bots
190 b_win_nacl_sdk_build = { 197 b_win_nacl_sdk_build = {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 # base.make_stop_form = hack_stop(base.make_stop_form) 389 # base.make_stop_form = hack_stop(base.make_stop_form)
383 390
384 391
385 ####### PROJECT IDENTITY 392 ####### PROJECT IDENTITY
386 393
387 # The 'projectURL' string will be used to provide a link 394 # The 'projectURL' string will be used to provide a link
388 # from buildbot HTML pages to your project's home page. 395 # from buildbot HTML pages to your project's home page.
389 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' 396 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
390 397
391 # vi: set ts=4 sts=2 sw=2 et: 398 # vi: set ts=4 sts=2 sw=2 et:
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698