bug 411495: sync up staging trunk buildbot/bootstrap configs with cvs - staging 1.9 buildbot configs. r=rhelmer, patch=me

This commit is contained in:
bhearsum%mozilla.com 2008-01-09 22:18:09 +00:00
Родитель 0edcaad7dc
Коммит 9fc33eef9e
1 изменённых файлов: 27 добавлений и 26 удалений

Просмотреть файл

@ -12,9 +12,9 @@ c = BuildmasterConfig = {}
# tuple of bot-name and bot-password. These correspond to values given to the # tuple of bot-name and bot-password. These correspond to values given to the
# buildslave's mktap invocation. # buildslave's mktap invocation.
c['bots'] = [("staging-trunk-automation",""), c['bots'] = [("staging-trunk-automation",""),
("fx-linux-slave1",""), ("fx-linux-1.9-slave1",""),
("fx-win32-slave1", ""), ("fx-win32-1.9-slave1", ""),
("bm-xserve14", "")] ("fx-mac-1.9-slave1", "")]
# 'slavePortnum' defines the TCP port to listen on. This must match the value # 'slavePortnum' defines the TCP port to listen on. This must match the value
# configured into the buildslaves (with their --master option) # configured into the buildslaves (with their --master option)
@ -34,7 +34,6 @@ from buildbot.changes import bonsaipoller
c['sources'].append( c['sources'].append(
bonsaipoller.BonsaiPoller( bonsaipoller.BonsaiPoller(
bonsaiURL = 'http://bonsai.mozilla.org', bonsaiURL = 'http://bonsai.mozilla.org',
#bonsaiURL = 'http://buildbot.roberthelmer.com',
module = 'PhoenixTinderbox', module = 'PhoenixTinderbox',
branch = 'HEAD', branch = 'HEAD',
pollInterval = 1 * 60, pollInterval = 1 * 60,
@ -52,16 +51,16 @@ from buildbot.changes.pb import PBChangeSource
c['schedulers'] = [] c['schedulers'] = []
# For nightly clobber only # For nightly clobber only
clobber_scheduler = Nightly( #clobber_scheduler = Nightly(
name='nightly', # name='nightly',
branch='HEAD', # branch='HEAD',
hour=[3], # hour=[3],
builderNames=[ # builderNames=[
'linux_clobber', # 'linux_clobber',
'win32_clobber', # 'win32_clobber',
'macosx_clobber', # 'macosx_clobber',
] # ]
) #)
# For nightly depend only # For nightly depend only
depend_scheduler = Scheduler( depend_scheduler = Scheduler(
@ -105,7 +104,7 @@ stage_depscheduler = Dependent(name="stage_dep", upstream=update_depscheduler,
"macosx_update_verify", "macosx_update_verify",
"stage"]) "stage"])
c['schedulers'].append(nightly_scheduler) #c['schedulers'].append(clobber_scheduler)
c['schedulers'].append(depend_scheduler) c['schedulers'].append(depend_scheduler)
c['schedulers'].append(tag_scheduler) c['schedulers'].append(tag_scheduler)
@ -121,7 +120,7 @@ c['sources'].append(PBChangeSource())
####### BUILDERS ####### BUILDERS
cvsroot = ":pserver:anonymous@cvs.mozilla.org:/cvsroot" cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot"
cvsmodule = "mozilla/tools/release" cvsmodule = "mozilla/tools/release"
automation_tag = "HEAD" automation_tag = "HEAD"
@ -131,6 +130,8 @@ from buildbot.process import factory
from buildbot.steps.shell import ShellCommand from buildbot.steps.shell import ShellCommand
from buildbot.steps.transfer import FileDownload from buildbot.steps.transfer import FileDownload
from buildbot import locks
# Do not reuse buildslaves. # Do not reuse buildslaves.
linux_lock = locks.SlaveLock("linux", maxCount=1) linux_lock = locks.SlaveLock("linux", maxCount=1)
macosx_lock = locks.SlaveLock("macosx", maxCount=1) macosx_lock = locks.SlaveLock("macosx", maxCount=1)
@ -153,17 +154,17 @@ depBuildFactory.addStep(ShellCommand, description='Build', workdir='build',
command=['perl', './release', '-o', 'Build'], command=['perl', './release', '-o', 'Build'],
timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'})
c['builders'].append({ 'name': 'linux_dep_build', c['builders'].append({ 'name': 'linux_dep_build',
'slavename': 'fx-linux-slave1', 'slavename': 'fx-linux-1.9-slave1',
'builddir': 'linux_dep_build', 'builddir': 'linux_dep_build',
'locks': [linux_lock], 'locks': [linux_lock],
'factory': depBuildFactory }) 'factory': depBuildFactory })
c['builders'].append({ 'name': 'win32_dep_build', c['builders'].append({ 'name': 'win32_dep_build',
'slavename': 'fx-win32-slave1', 'slavename': 'fx-win32-1.9-slave1',
'builddir': 'win32_dep_build', 'builddir': 'win32_dep_build',
'locks': [win32_lock], 'locks': [win32_lock],
'factory': depBuildFactory }) 'factory': depBuildFactory })
c['builders'].append({ 'name': 'macosx_dep_build', c['builders'].append({ 'name': 'macosx_dep_build',
'slavename': 'bm-xserve14', 'slavename': 'fx-mac-1.9-slave1',
'builddir': 'macosx_dep_build', 'builddir': 'macosx_dep_build',
'locks': [macosx_lock], 'locks': [macosx_lock],
'factory': depBuildFactory }) 'factory': depBuildFactory })
@ -287,13 +288,13 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)',
command=['perl', './release', '-a', '-o', 'Repack'], command=['perl', './release', '-a', '-o', 'Repack'],
timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1) timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1)
c['builders'].append({ 'name': 'linux_build', 'slavename': 'fx-linux-slave1', c['builders'].append({ 'name': 'linux_build', 'slavename': 'fx-linux-1.9-slave1',
'locks': [linux_lock], 'builddir': 'linux_build', 'locks': [linux_lock], 'builddir': 'linux_build',
'factory': buildFactory }) 'factory': buildFactory })
c['builders'].append({ 'name': 'win32_build', 'slavename': 'fx-win32-slave1', c['builders'].append({ 'name': 'win32_build', 'slavename': 'fx-win32-1.9-slave1',
'locks': [win32_lock], 'builddir': 'win32_build', 'locks': [win32_lock], 'builddir': 'win32_build',
'factory': buildFactory }) 'factory': buildFactory })
c['builders'].append({ 'name': 'macosx_build', 'slavename': 'bm-xserve14', c['builders'].append({ 'name': 'macosx_build', 'slavename': 'fx-mac-1.9-slave1',
'locks': [macosx_lock], 'builddir': 'macosx_build', 'locks': [macosx_lock], 'builddir': 'macosx_build',
'factory': buildFactory }) 'factory': buildFactory })
@ -337,7 +338,7 @@ l10nverifyFactory.addStep(ShellCommand, description='l10n verification', workdir
command=['perl', './release', '-v', '-o', 'Repack'], command=['perl', './release', '-v', '-o', 'Repack'],
timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'})
c['builders'].append({ 'name': 'l10nverify', 'slavename': 'bm-xserve14', c['builders'].append({ 'name': 'l10nverify', 'slavename': 'fx-mac-1.9-slave1',
'builddir': 'l10nverify', 'factory': l10nverifyFactory }) 'builddir': 'l10nverify', 'factory': l10nverifyFactory })
@ -395,11 +396,11 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work
command=['perl', './release', '-v', '-o', 'Updates'], command=['perl', './release', '-v', '-o', 'Updates'],
timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'})
c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'fx-linux-slave1', c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'fx-linux-1.9-slave1',
'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) 'builddir': 'linux_update_verify', 'factory': updateverifyFactory })
c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'fx-win32-slave1', c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'fx-win32-1.9-slave1',
'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) 'builddir': 'win32_update_verify', 'factory': updateverifyFactory })
c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'bm-xserve14', c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'fx-mac-1.9-slave1',
'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory })
stageFactory = factory.BuildFactory() stageFactory = factory.BuildFactory()