diff --git a/tools/buildbot-configs/automation/production/master.cfg b/tools/buildbot-configs/automation/production/master.cfg index e5b6e99ccdf..52ff81ebaaf 100644 --- a/tools/buildbot-configs/automation/production/master.cfg +++ b/tools/buildbot-configs/automation/production/master.cfg @@ -168,6 +168,7 @@ prestageFactory.addStep(ShellCommand, description="update bootstrap config", command=['cvs', 'up', '-CPd']) c['builders'].append({ 'name': 'prestage', 'slavename': 'production-1.8-master', + 'category': 'release', 'builddir': 'prestage', 'factory': prestageFactory }) tagFactory = factory.BuildFactory() @@ -190,6 +191,7 @@ tagFactory.addStep(ShellCommand, description='Tag', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'tag', 'slavename': 'production-1.8-master', + 'category': 'release', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -212,6 +214,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'source', 'slavename': 'production-1.8-master', + 'category': 'release', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -251,10 +254,13 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)', timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1) c['builders'].append({ 'name': 'linux_build', 'slavename': 'production-prometheus-vm', + 'category': 'release', 'builddir': 'linux_build', 'factory': buildFactory }) c['builders'].append({ 'name': 'win32_build', 'slavename': 'production-pacifica-vm', + 'category': 'release', 'builddir': 'win32_build', 'factory': buildFactory }) c['builders'].append({ 'name': 'macosx_build', 'slavename': 'bm-xserve05', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'macosx_build', 'factory': buildFactory }) signFactory = factory.BuildFactory() @@ -275,6 +281,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l timeout=86400, haltOnFailure=1) c['builders'].append({ 'name': 'sign', 'slavename': 'production-1.8-master', + 'category': 'release', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -298,6 +305,7 @@ l10nverifyFactory.addStep(ShellCommand, description='l10n verification', workdir timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'l10nverify', 'slavename': 'bm-xserve05', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'l10nverify', 'factory': l10nverifyFactory }) @@ -335,6 +343,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'update', 'slavename': 'production-prometheus-vm', + 'category': 'release', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -358,10 +367,13 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'production-prometheus-vm', + 'category': 'release', 'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'production-pacifica-vm', + 'category': 'release', 'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'bm-xserve05', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) stageFactory = factory.BuildFactory() @@ -384,6 +396,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'stage', 'slavename': 'production-1.8-master', + 'category': 'release', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -401,6 +414,10 @@ c['status'].append( c['status'].append( html.Waterfall(http_port=8810, css='./mozilla.css', categories=['nightly']) ) +c['status'].append( + html.Waterfall(http_port=8812, css='./mozilla.css', + categories = ['release']) +) from buildbot.status import tinderbox c['status'].append(tinderbox.TinderboxMailNotifier( diff --git a/tools/buildbot-configs/automation/staging-1.9/master.cfg b/tools/buildbot-configs/automation/staging-1.9/master.cfg index ac8f1f4b44c..aa8c1a89f85 100644 --- a/tools/buildbot-configs/automation/staging-1.9/master.cfg +++ b/tools/buildbot-configs/automation/staging-1.9/master.cfg @@ -263,18 +263,21 @@ c['builders'].append({ 'name': 'linux_prestage', 'slavename': 'fx-linux-1.9-slave1', 'builddir': 'linux_prestage', 'locks': [linux_lock], + 'category': 'release', 'factory': slavePrestageFactory }) c['builders'].append({ 'name': 'win32_prestage', 'slavename': 'fx-win32-1.9-slave1', 'builddir': 'win32_prestage', 'locks': [win32_lock], + 'category': 'release', 'factory': slavePrestageFactory }) c['builders'].append({ 'name': 'macosx_prestage', 'slavename': 'fx-mac-1.9-slave1', 'builddir': 'macosx_prestage', 'locks': [macosx_lock], + 'category': 'release', 'factory': slavePrestageFactory }) prestageFactory = factory.BuildFactory() @@ -316,6 +319,7 @@ prestageFactory.addStep(ShellCommand, description='create cvsmirror mofo', c['builders'].append({'name': 'prestage', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'prestage', 'factory': prestageFactory }) @@ -344,6 +348,7 @@ tagFactory.addStep(ShellCommand, description='do valid l10n checkout', workdir="/tmp") c['builders'].append({ 'name': 'tag', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -364,6 +369,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'source', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -401,12 +407,15 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)', timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1) c['builders'].append({ 'name': 'linux_build', 'slavename': 'fx-linux-1.9-slave1', + 'category': 'release', 'locks': [linux_lock], 'builddir': 'linux_build', 'factory': buildFactory }) c['builders'].append({ 'name': 'win32_build', 'slavename': 'fx-win32-1.9-slave1', + 'category': 'release', 'locks': [win32_lock], 'builddir': 'win32_build', 'factory': buildFactory }) c['builders'].append({ 'name': 'macosx_build', 'slavename': 'fx-mac-1.9-slave1', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'macosx_build', 'factory': buildFactory }) @@ -430,6 +439,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l timeout=86400, haltOnFailure=1) c['builders'].append({ 'name': 'sign', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -451,6 +461,7 @@ l10nverifyFactory.addStep(ShellCommand, description='l10n verification', workdir timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'l10nverify', 'slavename': 'fx-mac-1.9-slave1', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'l10nverify', 'factory': l10nverifyFactory }) @@ -489,6 +500,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'update', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -510,10 +522,13 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'fx-linux-1.9-slave1', + 'category': 'release', 'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'fx-win32-1.9-slave1', + 'category': 'release', 'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'fx-mac-1.9-slave1', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) stageFactory = factory.BuildFactory() @@ -534,6 +549,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'stage', 'slavename': 'staging-1.9-master', + 'category': 'release', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -552,6 +568,10 @@ c['status'].append( html.Waterfall(http_port=8811, css='./mozilla.css', categories = ['nightly','nightly_experimental']) ) +c['status'].append( + html.Waterfall(http_port=8812, css='./mozilla.css', + categories = ['release']) +) from buildbot.status import tinderbox c['status'].append(tinderbox.TinderboxMailNotifier( diff --git a/tools/buildbot-configs/automation/staging/master.cfg b/tools/buildbot-configs/automation/staging/master.cfg index 8a9aadebe10..453997514be 100644 --- a/tools/buildbot-configs/automation/staging/master.cfg +++ b/tools/buildbot-configs/automation/staging/master.cfg @@ -192,18 +192,21 @@ c['builders'].append({ 'name': 'linux_prestage', 'slavename': 'staging-prometheus-vm', 'builddir': 'linux_prestage', 'locks': [linux_lock], + 'category': 'release', 'factory': slavePrestageFactory }) c['builders'].append({ 'name': 'win32_prestage', 'slavename': 'staging-pacifica-vm', 'builddir': 'win32_prestage', 'locks': [win32_lock], + 'category': 'release', 'factory': slavePrestageFactory }) c['builders'].append({ 'name': 'macosx_prestage', 'slavename': 'bm-xserve03', 'builddir': 'macosx_prestage', 'locks': [macosx_lock], + 'category': 'release', 'factory': slavePrestageFactory }) prestageFactory = factory.BuildFactory() @@ -247,6 +250,7 @@ prestageFactory.addStep(ShellCommand, description='create cvsmirror mofo', haltOnFailure=1) c['builders'].append({ 'name': 'prestage', 'slavename': 'staging-1.8-master', + 'category': 'release', 'builddir': 'prestage', 'factory': prestageFactory }) @@ -271,6 +275,7 @@ tagFactory.addStep(ShellCommand, description='Tag', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'tag', 'slavename': 'staging-1.8-master', + 'category': 'release', 'builddir': 'tag', 'factory': tagFactory }) sourceFactory = factory.BuildFactory() @@ -293,6 +298,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'source', 'slavename': 'staging-1.8-master', + 'category': 'release', 'builddir': 'source', 'factory': sourceFactory }) buildFactory = factory.BuildFactory() @@ -332,16 +338,19 @@ buildFactory.addStep(ShellCommand, description='Repack (announce)', timeout=36000, env={'CVS_RSH': 'ssh'}, haltOnFailure=1) c['builders'].append({ 'name': 'linux_build', + 'category': 'release', 'slavename': 'staging-prometheus-vm', 'builddir': 'linux_build', 'locks': [linux_lock], 'factory': buildFactory }) c['builders'].append({ 'name': 'win32_build', + 'category': 'release', 'slavename': 'staging-pacifica-vm', 'builddir': 'win32_build', 'locks': [win32_lock], 'factory': buildFactory }) c['builders'].append({ 'name': 'macosx_build', + 'category': 'release', 'slavename': 'bm-xserve03', 'builddir': 'macosx_build', 'locks': [macosx_lock], @@ -369,6 +378,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l timeout=86400, haltOnFailure=1) c['builders'].append({ 'name': 'sign', 'slavename': 'staging-1.8-master', + 'category': 'release', 'builddir': 'sign', 'factory': signFactory }) l10nverifyFactory = factory.BuildFactory() @@ -392,6 +402,7 @@ l10nverifyFactory.addStep(ShellCommand, description='l10n verification', workdir timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'l10nverify', 'slavename': 'bm-xserve03', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'l10nverify', 'factory': l10nverifyFactory }) @@ -432,6 +443,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'update', 'slavename': 'staging-prometheus-vm', + 'category': 'release', 'locks': [linux_lock], 'builddir': 'update', 'factory': updateFactory }) updateverifyFactory = factory.BuildFactory() @@ -455,10 +467,13 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'}) c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'staging-prometheus-vm', + 'category': 'release', 'locks': [linux_lock], 'builddir': 'linux_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'staging-pacifica-vm', + 'category': 'release', 'locks': [win32_lock], 'builddir': 'win32_update_verify', 'factory': updateverifyFactory }) c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'bm-xserve03', + 'category': 'release', 'locks': [macosx_lock], 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory }) stageFactory = factory.BuildFactory() @@ -481,6 +496,7 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build', timeout=36000, haltOnFailure=1) c['builders'].append({ 'name': 'stage', 'slavename': 'staging-1.8-master', + 'category': 'release', 'builddir': 'stage', 'factory': stageFactory }) ####### STATUS TARGETS @@ -498,6 +514,10 @@ c['status'].append( c['status'].append( html.Waterfall(http_port=8811, css='./mozilla.css', categories = ['nightly']) ) +c['status'].append( + html.Waterfall(http_port=8812, css='./mozilla.css', + categories = ['release']) +) from buildbot.status import tinderbox c['status'].append(tinderbox.TinderboxMailNotifier(