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

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

Issue 1920133002: Remove stray references to linux_ecs_ozone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase Created 4 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | masters/master.tryserver.chromium.linux/slaves.cfg » ('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
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 }) 222 })
223 223
224 # Chromecast builders using chromium_trybot 224 # Chromecast builders using chromium_trybot
225 chromium_builders.extend([{ 225 chromium_builders.extend([{
226 'name': 'cast_shell_linux', 226 'name': 'cast_shell_linux',
227 'factory': m_annotator.BaseFactory( 227 'factory': m_annotator.BaseFactory(
228 'chromium_trybot', max_time=master_utils.CQ_MAX_TIME), 228 'chromium_trybot', max_time=master_utils.CQ_MAX_TIME),
229 }, 229 },
230 ]) 230 ])
231 231
232 # Ozone builder
233 ozone_builders = [{
234 'name': 'linux_ecs_ozone',
235 'builddir': 'ozone-linux',
236 'factory': m_annotator.BaseFactory('ozone_ecs',
237 {'use_mirror': ActiveMaster.is_production_host or None}),
238 }]
239
240 b_linux_site_isolation = { 232 b_linux_site_isolation = {
241 'name': 'linux_site_isolation', 233 'name': 'linux_site_isolation',
242 'factory': m_annotator.BaseFactory('chromium_trybot'), 234 'factory': m_annotator.BaseFactory('chromium_trybot'),
243 # Share build directory with compatible existing builders to save space. 235 # Share build directory with compatible existing builders to save space.
244 'slavebuilddir': 'linux', 236 'slavebuilddir': 'linux',
245 } 237 }
246 238
247 b_linux_chromium_asan_rel_ng = { 239 b_linux_chromium_asan_rel_ng = {
248 'name': 'linux_chromium_asan_rel_ng', 240 'name': 'linux_chromium_asan_rel_ng',
249 'factory': m_annotator.BaseFactory( 241 'factory': m_annotator.BaseFactory(
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 c['builders'] = [ 394 c['builders'] = [
403 b_chromium_presubmit, 395 b_chromium_presubmit,
404 b_codesearch_chromeos_builder, 396 b_codesearch_chromeos_builder,
405 b_codesearch_linux_builder, 397 b_codesearch_linux_builder,
406 b_linux_chromium_asan_rel_ng, 398 b_linux_chromium_asan_rel_ng,
407 b_linux_chromium_browser_side_navigation_rel, 399 b_linux_chromium_browser_side_navigation_rel,
408 b_linux_full_bisect_builder, 400 b_linux_full_bisect_builder,
409 b_linux_nacl_sdk, 401 b_linux_nacl_sdk,
410 b_linux_nacl_sdk_build, 402 b_linux_nacl_sdk_build,
411 b_linux_site_isolation, 403 b_linux_site_isolation,
412 ] + chromium_builders + ozone_builders + variable_builders 404 ] + chromium_builders + variable_builders
413 405
414 406
415 # Slaves are loaded from slaves.cfg. 407 # Slaves are loaded from slaves.cfg.
416 slaves = slaves_list.SlavesList('slaves.cfg', 'TryServerChromiumLinux') 408 slaves = slaves_list.SlavesList('slaves.cfg', 'TryServerChromiumLinux')
417 409
418 for builder in c['builders']: 410 for builder in c['builders']:
419 # Associate the slaves to the builders. The configuration is in slaves.cfg. 411 # Associate the slaves to the builders. The configuration is in slaves.cfg.
420 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name']) 412 builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
421 # Sets nextSlave function for slave affinity. 413 # Sets nextSlave function for slave affinity.
422 builder['nextSlave'] = master_utils.PreferredBuilderNextSlaveFunc() 414 builder['nextSlave'] = master_utils.PreferredBuilderNextSlaveFunc()
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 # base.make_stop_form = hack_stop(base.make_stop_form) 525 # base.make_stop_form = hack_stop(base.make_stop_form)
534 526
535 527
536 ####### PROJECT IDENTITY 528 ####### PROJECT IDENTITY
537 529
538 # The 'projectURL' string will be used to provide a link 530 # The 'projectURL' string will be used to provide a link
539 # from buildbot HTML pages to your project's home page. 531 # from buildbot HTML pages to your project's home page.
540 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' 532 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
541 533
542 # vi: set ts=4 sts=2 sw=2 et: 534 # vi: set ts=4 sts=2 sw=2 et:
OLDNEW
« no previous file with comments | « no previous file | masters/master.tryserver.chromium.linux/slaves.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698