From 2bdd83368dd3c32d525a2da4def7a57faeeeb34e Mon Sep 17 00:00:00 2001 From: "bhearsum%mozilla.com" Date: Wed, 23 Jan 2008 16:03:31 +0000 Subject: [PATCH] bug 412542: rename buildbot buildmasters - update master.cfg's. r=rhelmer,joduinn patch=me git-svn-id: svn://10.0.0.236/trunk@243829 18797224-902f-48f8-a5cc-f745e15eee43 --- .../automation/production-1.9/master.cfg | 16 ++--- .../automation/production/master.cfg | 60 ++++++++--------- .../automation/staging-1.9/master.cfg | 16 ++--- .../automation/staging/master.cfg | 64 ++++++++++--------- 4 files changed, 80 insertions(+), 76 deletions(-) diff --git a/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg b/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg index 7960a250c1b..79fcb2f756c 100644 --- a/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg @@ -11,7 +11,7 @@ c = BuildmasterConfig = {} # the 'bots' list defines the set of allowable buildslaves. Each element is a # tuple of bot-name and bot-password. These correspond to values given to the # buildslave's mktap invocation. -c['bots'] = [("production-trunk-automation",""), +c['bots'] = [("production-1.9-master",""), ("fx-linux-1.9-slave2",""), ("fx-win32-1.9-slave2", ""), ("fx-mac-1.9-slave2", "")] @@ -104,7 +104,7 @@ prestageFactory.addStep(ShellCommand, description='create staging area', haltOnFailure=1) c['builders'].append({'name': 'prestage', - 'slavename': 'production-trunk-automation', + 'slavename': 'production-1.9-master', 'builddir': 'prestage', 'factory': prestageFactory }) tagFactory = factory.BuildFactory() @@ -124,7 +124,7 @@ tagFactory.addStep(ShellCommand, description='Tag', command=['perl', './release', '-o', 'Tag'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'tag', 'slavename': 'production-trunk-automation', +c['builders'].append({ 'name': 'tag', 'slavename': 'production-1.9-master', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -144,7 +144,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', command=['perl', './release', '-o', 'Source'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'source', 'slavename': 'production-trunk-automation', +c['builders'].append({ 'name': 'source', 'slavename': 'production-1.9-master', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -203,7 +203,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l command=['perl', './release', '-o', 'Sign'], timeout=86400, haltOnFailure=1) -c['builders'].append({ 'name': 'sign', 'slavename': 'production-trunk-automation', +c['builders'].append({ 'name': 'sign', 'slavename': 'production-1.9-master', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -261,7 +261,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', command=['perl', './release', '-a', '-o', 'Updates'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'update', 'slavename': 'production-trunk-automation', +c['builders'].append({ 'name': 'update', 'slavename': 'production-1.9-master', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -306,7 +306,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', command=['perl', './release', '-o', 'Stage'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'stage', 'slavename': 'production-trunk-automation', +c['builders'].append({ 'name': 'stage', 'slavename': 'production-1.9-master', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -340,4 +340,4 @@ c['status'].append(tinderbox.TinderboxMailNotifier( ####### PROJECT IDENTITY c['projectName'] = "Release Automation - Trunk/1.9" c['projectURL'] = "http://www.mozilla.org/" -c['buildbotURL'] = "http://production-trunk-automation.build.mozilla.org:8810" +c['buildbotURL'] = "http://production-1.9-master.build.mozilla.org:8810" diff --git a/mozilla/tools/buildbot-configs/automation/production/master.cfg b/mozilla/tools/buildbot-configs/automation/production/master.cfg index 1afed6945ac..0db55e10632 100644 --- a/mozilla/tools/buildbot-configs/automation/production/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/production/master.cfg @@ -11,20 +11,22 @@ c = BuildmasterConfig = {} # the 'bots' list defines the set of allowable buildslaves. Each element is a # tuple of bot-name and bot-password. These correspond to values given to the # buildslave's mktap invocation. -c['bots'] = [("linux-1.8-console1",""), - ("linux-1.8-console2",""), - ("linux-1.8-slave1", ""), - ("linux-1.8-slave2", ""), - ("macosx-1.8-slave1", ""), - ("macosx-1.8-slave2", ""), - ("win32-1.8-slave1", ""), - ("win32-1.8-slave2", ""), - ("linux-trunk-slave1", ""), - ("linux-trunk-slave2", ""), - ("macosx-trunk-slave1", ""), - ("macosx-trunk-slave2", ""), - ("win32-trunk-slave1", ""), - ("win32-trunk-slave2", "")] +c['bots'] = [("staging-1.8-master",""), + ("production-1.8-master",""), + ("staging-prometheus-vm", ""), + ("production-prometheus-vm", ""), + ("bm-xserve03", ""), + ("bm-xserve05", ""), + ("staging-pacifica-vm", ""), + ("production-pacifica-vm", ""), + ("staging-1.9-master",""), + ("fx-linux-1.9-slave1",""), + ("fx-win32-1.9-slave1", ""), + ("fx-mac-1.9-slave1", ""), + ("production-1.9-master",""), + ("fx-linux-1.9-slave2",""), + ("fx-win32-1.9-slave2", ""), + ("fx-mac-1.9-slave2", "")] # 'slavePortnum' defines the TCP port to listen on. This must match the value # configured into the buildslaves (with their --master option) @@ -80,7 +82,7 @@ c['sources'].append(PBChangeSource()) ####### BUILDERS cvsroot = ":ext:cltbld@cvs.mozilla.org:/cvsroot" -##cvsroot = "build-console.build.mozilla.org:/builds/cvsmirror/cvsroot" +##cvsroot = "production-1.8-master.build.mozilla.org:/builds/cvsmirror/cvsroot" cvsmodule = "mozilla/tools/release" automation_tag = "RELEASE_AUTOMATION_M6_1" @@ -95,7 +97,7 @@ prestageFactory.addStep(ShellCommand, description="update bootstrap config", workdir="/builds/buildbot/Automation/bootstrap-configs", command=['cvs', 'up', '-CPd']) -c['builders'].append({ 'name': 'prestage', 'slavename': 'linux-1.8-console2', +c['builders'].append({ 'name': 'prestage', 'slavename': 'production-1.8-master', 'builddir': 'prestage', 'factory': prestageFactory }) tagFactory = factory.BuildFactory() @@ -117,7 +119,7 @@ tagFactory.addStep(ShellCommand, description='Tag', command=['perl', './release', '-o', 'Tag'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'tag', 'slavename': 'linux-1.8-console2', +c['builders'].append({ 'name': 'tag', 'slavename': 'production-1.8-master', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -139,7 +141,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', command=['perl', './release', '-o', 'Source'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'source', 'slavename': 'linux-1.8-console2', +c['builders'].append({ 'name': 'source', 'slavename': 'production-1.8-master', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -178,11 +180,11 @@ 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': 'linux-1.8-slave2', +c['builders'].append({ 'name': 'linux_build', 'slavename': 'production-prometheus-vm', 'builddir': 'linux_build', 'factory': buildFactory }) -c['builders'].append({ 'name': 'win32_build', 'slavename': 'win32-1.8-slave2', +c['builders'].append({ 'name': 'win32_build', 'slavename': 'production-pacifica-vm', 'builddir': 'win32_build', 'factory': buildFactory }) -c['builders'].append({ 'name': 'macosx_build', 'slavename': 'macosx-1.8-slave2', +c['builders'].append({ 'name': 'macosx_build', 'slavename': 'bm-xserve05', 'builddir': 'macosx_build', 'factory': buildFactory }) signFactory = factory.BuildFactory() @@ -202,7 +204,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l command=['perl', './release', '-o', 'Sign'], timeout=86400, haltOnFailure=1) -c['builders'].append({ 'name': 'sign', 'slavename': 'linux-1.8-console2', +c['builders'].append({ 'name': 'sign', 'slavename': 'production-1.8-master', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -225,7 +227,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': 'macosx-1.8-slave2', +c['builders'].append({ 'name': 'l10nverify', 'slavename': 'bm-xserve05', 'builddir': 'l10nverify', 'factory': l10nverifyFactory }) @@ -262,7 +264,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', command=['perl', './release', '-a', '-o', 'Updates'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'update', 'slavename': 'linux-1.8-slave2', +c['builders'].append({ 'name': 'update', 'slavename': 'production-prometheus-vm', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -285,11 +287,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': 'linux-1.8-slave2', +c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'production-prometheus-vm', 'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) -c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'win32-1.8-slave2', +c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'production-pacifica-vm', 'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) -c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'macosx-1.8-slave2', +c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'bm-xserve05', 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) stageFactory = factory.BuildFactory() @@ -311,7 +313,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', command=['perl', './release', '-o', 'Stage'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'stage', 'slavename': 'linux-1.8-console2', +c['builders'].append({ 'name': 'stage', 'slavename': 'production-1.8-master', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -345,4 +347,4 @@ c['status'].append(tinderbox.TinderboxMailNotifier( ####### PROJECT IDENTITY c['projectName'] = "Release Automation Production" c['projectURL'] = "http://www.mozilla.org/" -c['buildbotURL'] = "http://localhost:8010/" +c['buildbotURL'] = "http://production-1.8-master.build.mozilla.org:8810/" diff --git a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg index 1bab662b467..d1cd504697e 100644 --- a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg @@ -11,7 +11,7 @@ c = BuildmasterConfig = {} # the 'bots' list defines the set of allowable buildslaves. Each element is a # tuple of bot-name and bot-password. These correspond to values given to the # buildslave's mktap invocation. -c['bots'] = [("staging-trunk-automation",""), +c['bots'] = [("staging-1.9-master",""), ("fx-linux-1.9-slave1",""), ("fx-win32-1.9-slave1", ""), ("fx-mac-1.9-slave1", "")] @@ -204,7 +204,7 @@ prestageFactory.addStep(ShellCommand, description='create cvsmirror mofo', haltOnFailure=1) c['builders'].append({'name': 'prestage', - 'slavename': 'staging-trunk-automation', + 'slavename': 'staging-1.9-master', 'builddir': 'prestage', 'factory': prestageFactory }) @@ -232,7 +232,7 @@ tagFactory.addStep(ShellCommand, description='do valid l10n checkout', 'l10n/de/browser/README.txt'], workdir="/tmp") -c['builders'].append({ 'name': 'tag', 'slavename': 'staging-trunk-automation', +c['builders'].append({ 'name': 'tag', 'slavename': 'staging-1.9-master', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -252,7 +252,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', command=['perl', './release', '-o', 'Source'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'source', 'slavename': 'staging-trunk-automation', +c['builders'].append({ 'name': 'source', 'slavename': 'staging-1.9-master', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -318,7 +318,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l command=['perl', './release', '-o', 'Sign'], timeout=86400, haltOnFailure=1) -c['builders'].append({ 'name': 'sign', 'slavename': 'staging-trunk-automation', +c['builders'].append({ 'name': 'sign', 'slavename': 'staging-1.9-master', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -376,7 +376,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', command=['perl', './release', '-a', '-o', 'Updates'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'update', 'slavename': 'staging-trunk-automation', +c['builders'].append({ 'name': 'update', 'slavename': 'staging-1.9-master', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -421,7 +421,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', command=['perl', './release', '-o', 'Stage'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'stage', 'slavename': 'staging-trunk-automation', +c['builders'].append({ 'name': 'stage', 'slavename': 'staging-1.9-master', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -458,4 +458,4 @@ c['status'].append(tinderbox.TinderboxMailNotifier( ####### PROJECT IDENTITY c['projectName'] = "Release Automation Test" c['projectURL'] = "http://www.mozilla.org/" -c['buildbotURL'] = "http://staging-trunk-automation.build.mozilla.org:8810" +c['buildbotURL'] = "http://staging-1.9-master.build.mozilla.org:8810" diff --git a/mozilla/tools/buildbot-configs/automation/staging/master.cfg b/mozilla/tools/buildbot-configs/automation/staging/master.cfg index ec70f8abe5f..b111d27a88e 100644 --- a/mozilla/tools/buildbot-configs/automation/staging/master.cfg +++ b/mozilla/tools/buildbot-configs/automation/staging/master.cfg @@ -11,20 +11,22 @@ c = BuildmasterConfig = {} # the 'bots' list defines the set of allowable buildslaves. Each element is a # tuple of bot-name and bot-password. These correspond to values given to the # buildslave's mktap invocation. -c['bots'] = [("linux-1.8-console1",""), - ("linux-1.8-console2",""), - ("linux-1.8-slave1", ""), - ("linux-1.8-slave2", ""), - ("macosx-1.8-slave1", ""), - ("macosx-1.8-slave2", ""), - ("win32-1.8-slave1", ""), - ("win32-1.8-slave2", ""), - ("linux-trunk-slave1", ""), - ("linux-trunk-slave2", ""), - ("macosx-trunk-slave1", ""), - ("macosx-trunk-slave2", ""), - ("win32-trunk-slave1", ""), - ("win32-trunk-slave2", "")] +c['bots'] = [("staging-1.8-master",""), + ("production-1.8-master",""), + ("staging-prometheus-vm", ""), + ("production-prometheus-vm", ""), + ("bm-xserve03", ""), + ("bm-xserve05", ""), + ("staging-pacifica-vm", ""), + ("production-pacifica-vm", ""), + ("staging-1.9-master",""), + ("fx-linux-1.9-slave1",""), + ("fx-win32-1.9-slave1", ""), + ("fx-mac-1.9-slave1", ""), + ("production-1.9-master",""), + ("fx-linux-1.9-slave2",""), + ("fx-win32-1.9-slave2", ""), + ("fx-mac-1.9-slave2", "")] # 'slavePortnum' defines the TCP port to listen on. This must match the value # configured into the buildslaves (with their --master option) @@ -146,19 +148,19 @@ 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': 'linux-1.8-slave1', + 'slavename': 'staging-prometheus-vm', 'builddir': 'linux_dep_build', 'locks': [linux_lock], 'category': 'nightly', 'factory': depBuildFactory }) c['builders'].append({ 'name': 'win32_dep_build', - 'slavename': 'win32-1.8-slave1', + 'slavename': 'staging-pacifica-vm', 'builddir': 'win32_dep_build', 'locks': [win32_lock], 'category': 'nightly', 'factory': depBuildFactory }) c['builders'].append({ 'name': 'macosx_dep_build', - 'slavename': 'macosx-1.8-slave1', + 'slavename': 'bm-xserve03', 'builddir': 'macosx_dep_build', 'locks': [macosx_lock], 'category': 'nightly', @@ -201,7 +203,7 @@ prestageFactory.addStep(ShellCommand, description='create cvsmirror mofo', '/builds/cvsmirror/mofo/'], haltOnFailure=1) -c['builders'].append({ 'name': 'prestage', 'slavename': 'linux-1.8-console1', +c['builders'].append({ 'name': 'prestage', 'slavename': 'staging-1.8-master', 'builddir': 'prestage', 'factory': prestageFactory }) @@ -225,7 +227,7 @@ tagFactory.addStep(ShellCommand, description='Tag', command=['perl', './release', '-o', 'Tag'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'tag', 'slavename': 'linux-1.8-console1', +c['builders'].append({ 'name': 'tag', 'slavename': 'staging-1.8-master', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -247,7 +249,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', command=['perl', './release', '-o', 'Source'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'source', 'slavename': 'linux-1.8-console1', +c['builders'].append({ 'name': 'source', 'slavename': 'staging-1.8-master', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -287,17 +289,17 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)', timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1) c['builders'].append({ 'name': 'linux_build', - 'slavename': 'linux-1.8-slave1', + 'slavename': 'staging-prometheus-vm', 'builddir': 'linux_build', 'locks': [linux_lock], 'factory': buildFactory }) c['builders'].append({ 'name': 'win32_build', - 'slavename': 'win32-1.8-slave1', + 'slavename': 'staging-pacifica-vm', 'builddir': 'win32_build', 'locks': [win32_lock], 'factory': buildFactory }) c['builders'].append({ 'name': 'macosx_build', - 'slavename': 'macosx-1.8-slave1', + 'slavename': 'bm-xserve03', 'builddir': 'macosx_build', 'locks': [macosx_lock], 'factory': buildFactory }) @@ -323,7 +325,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l command=['perl', './release', '-o', 'Sign'], timeout=86400, haltOnFailure=1) -c['builders'].append({ 'name': 'sign', 'slavename': 'linux-1.8-console1', +c['builders'].append({ 'name': 'sign', 'slavename': 'staging-1.8-master', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -346,7 +348,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': 'macosx-1.8-slave1', +c['builders'].append({ 'name': 'l10nverify', 'slavename': 'bm-xserve03', 'builddir': 'l10nverify', 'factory': l10nverifyFactory }) @@ -385,7 +387,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', command=['perl', './release', '-a', '-o', 'Updates'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'update', 'slavename': 'linux-1.8-slave1', +c['builders'].append({ 'name': 'update', 'slavename': 'staging-prometheus-vm', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -408,11 +410,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': 'linux-1.8-slave1', +c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'staging-prometheus-vm', 'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) -c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'win32-1.8-slave1', +c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'staging-pacifica-vm', 'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) -c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'macosx-1.8-slave1', +c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'bm-xserve03', 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) stageFactory = factory.BuildFactory() @@ -434,7 +436,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', command=['perl', './release', '-o', 'Stage'], timeout=36000, haltOnFailure=1) -c['builders'].append({ 'name': 'stage', 'slavename': 'linux-1.8-console1', +c['builders'].append({ 'name': 'stage', 'slavename': 'staging-1.8-master', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -471,4 +473,4 @@ c['status'].append(tinderbox.TinderboxMailNotifier( ####### PROJECT IDENTITY c['projectName'] = "Release Automation Test" c['projectURL'] = "http://www.mozilla.org/" -c['buildbotURL'] = "http://localhost:8010/" +c['buildbotURL'] = "http://staging-1.8-master.build.mozilla.org:8810/"