From 9fc33eef9e682b83c464856efe9065633ad95f91 Mon Sep 17 00:00:00 2001 From: "bhearsum%mozilla.com" Date: Wed, 9 Jan 2008 22:18:09 +0000 Subject: [PATCH] bug 411495: sync up staging trunk buildbot/bootstrap configs with cvs - staging 1.9 buildbot configs. r=rhelmer, patch=me --- .../automation/staging-1.9/master.cfg | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/tools/buildbot-configs/automation/staging-1.9/master.cfg b/tools/buildbot-configs/automation/staging-1.9/master.cfg index cb704e6109f..53b23776f2e 100644 --- a/tools/buildbot-configs/automation/staging-1.9/master.cfg +++ b/tools/buildbot-configs/automation/staging-1.9/master.cfg @@ -12,9 +12,9 @@ c = BuildmasterConfig = {} # tuple of bot-name and bot-password. These correspond to values given to the # buildslave's mktap invocation. c['bots'] = [("staging-trunk-automation",""), - ("fx-linux-slave1",""), - ("fx-win32-slave1", ""), - ("bm-xserve14", "")] + ("fx-linux-1.9-slave1",""), + ("fx-win32-1.9-slave1", ""), + ("fx-mac-1.9-slave1", "")] # 'slavePortnum' defines the TCP port to listen on. This must match the value # configured into the buildslaves (with their --master option) @@ -34,7 +34,6 @@ from buildbot.changes import bonsaipoller c['sources'].append( bonsaipoller.BonsaiPoller( bonsaiURL = 'http://bonsai.mozilla.org', - #bonsaiURL = 'http://buildbot.roberthelmer.com', module = 'PhoenixTinderbox', branch = 'HEAD', pollInterval = 1 * 60, @@ -52,16 +51,16 @@ from buildbot.changes.pb import PBChangeSource c['schedulers'] = [] # For nightly clobber only -clobber_scheduler = Nightly( - name='nightly', - branch='HEAD', - hour=[3], - builderNames=[ - 'linux_clobber', - 'win32_clobber', - 'macosx_clobber', - ] -) +#clobber_scheduler = Nightly( +# name='nightly', +# branch='HEAD', +# hour=[3], +# builderNames=[ +# 'linux_clobber', +# 'win32_clobber', +# 'macosx_clobber', +# ] +#) # For nightly depend only depend_scheduler = Scheduler( @@ -105,7 +104,7 @@ stage_depscheduler = Dependent(name="stage_dep", upstream=update_depscheduler, "macosx_update_verify", "stage"]) -c['schedulers'].append(nightly_scheduler) +#c['schedulers'].append(clobber_scheduler) c['schedulers'].append(depend_scheduler) c['schedulers'].append(tag_scheduler) @@ -121,7 +120,7 @@ c['sources'].append(PBChangeSource()) ####### BUILDERS -cvsroot = ":pserver:anonymous@cvs.mozilla.org:/cvsroot" +cvsroot = ":ext:stgbld@cvs.mozilla.org:/cvsroot" cvsmodule = "mozilla/tools/release" automation_tag = "HEAD" @@ -131,6 +130,8 @@ from buildbot.process import factory from buildbot.steps.shell import ShellCommand from buildbot.steps.transfer import FileDownload +from buildbot import locks + # Do not reuse buildslaves. linux_lock = locks.SlaveLock("linux", 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'], timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'linux_dep_build', - 'slavename': 'fx-linux-slave1', + 'slavename': 'fx-linux-1.9-slave1', 'builddir': 'linux_dep_build', 'locks': [linux_lock], 'factory': depBuildFactory }) c['builders'].append({ 'name': 'win32_dep_build', - 'slavename': 'fx-win32-slave1', + 'slavename': 'fx-win32-1.9-slave1', 'builddir': 'win32_dep_build', 'locks': [win32_lock], 'factory': depBuildFactory }) c['builders'].append({ 'name': 'macosx_dep_build', - 'slavename': 'bm-xserve14', + 'slavename': 'fx-mac-1.9-slave1', 'builddir': 'macosx_dep_build', 'locks': [macosx_lock], 'factory': depBuildFactory }) @@ -287,13 +288,13 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)', command=['perl', './release', '-a', '-o', 'Repack'], 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', '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', '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', 'factory': buildFactory }) @@ -337,7 +338,7 @@ l10nverifyFactory.addStep(ShellCommand, description='l10n verification', workdir command=['perl', './release', '-v', '-o', 'Repack'], 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 }) @@ -395,11 +396,11 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work command=['perl', './release', '-v', '-o', 'Updates'], 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 }) -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 }) -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 }) stageFactory = factory.BuildFactory()