зеркало из https://github.com/mozilla/pjs.git
bug 431723: upgrade release automation buildbots to 0.7.7 - 1.8 staging and production changes for 0.7.7. r=nrthomas, patch=me
This commit is contained in:
bhearsum%mozilla.com
Родитель
859ed5a4dc
Коммит
ef269b887e
|
|
@ -11,23 +11,26 @@ 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-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", ""),
|
||||
|
||||
from buildbot.buildslave import BuildSlave
|
||||
|
||||
c['buildslaves'] = [
|
||||
BuildSlave("staging-1.8-master",""),
|
||||
BuildSlave("production-1.8-master",""),
|
||||
BuildSlave("staging-prometheus-vm", ""),
|
||||
BuildSlave("production-prometheus-vm", ""),
|
||||
BuildSlave("bm-xserve03", ""),
|
||||
BuildSlave("bm-xserve05", ""),
|
||||
BuildSlave("staging-pacifica-vm", ""),
|
||||
BuildSlave("production-pacifica-vm", ""),
|
||||
BuildSlave("staging-1.9-master",""),
|
||||
BuildSlave("fx-linux-1.9-slave1",""),
|
||||
BuildSlave("fx-win32-1.9-slave1", ""),
|
||||
BuildSlave("fx-mac-1.9-slave1", ""),
|
||||
BuildSlave("production-1.9-master",""),
|
||||
BuildSlave("fx-linux-1.9-slave2",""),
|
||||
BuildSlave("fx-win32-1.9-slave2", ""),
|
||||
BuildSlave("fx-mac-1.9-slave2", ""),
|
||||
]
|
||||
|
||||
# 'slavePortnum' defines the TCP port to listen on. This must match the value
|
||||
|
|
@ -41,11 +44,11 @@ c['slavePortnum'] = 9989
|
|||
# source code changes. Any class which implements IChangeSource can be added
|
||||
# to this list: there are several in buildbot/changes/*.py to choose from.
|
||||
|
||||
c['sources'] = []
|
||||
c['change_source'] = []
|
||||
|
||||
#from buildbot.changes import bonsaipoller
|
||||
#
|
||||
#c['sources'].append(
|
||||
#c['change_source'].append(
|
||||
# bonsaipoller.BonsaiPoller(
|
||||
# bonsaiURL = 'http://bonsai.mozilla.org',
|
||||
# module = 'AviarySuiteBranchTinderbox',
|
||||
|
|
@ -125,7 +128,7 @@ c['schedulers'].append(sign_depscheduler)
|
|||
c['schedulers'].append(update_depscheduler)
|
||||
c['schedulers'].append(stage_depscheduler)
|
||||
|
||||
c['sources'].append(PBChangeSource())
|
||||
c['change_source'].append(PBChangeSource())
|
||||
|
||||
####### BUILDERS
|
||||
|
||||
|
|
@ -513,17 +516,7 @@ c['status'] = []
|
|||
|
||||
from buildbot.status import html
|
||||
c['status'].append(
|
||||
html.Waterfall(http_port=8810, css='./mozilla.css')
|
||||
)
|
||||
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'],
|
||||
)
|
||||
html.WebStatus(http_port=8810)
|
||||
)
|
||||
|
||||
from buildbot.status import tinderbox
|
||||
|
|
@ -535,16 +528,6 @@ c['status'].append(tinderbox.TinderboxMailNotifier(
|
|||
logCompression="bzip2")
|
||||
)
|
||||
|
||||
#from buildbot.status.mail import MailNotifier
|
||||
#c['status'].append(MailNotifier(
|
||||
# fromaddr="bootstrap@mozilla.com",
|
||||
# sendToInterestedUsers=False,
|
||||
# extraRecipients=["build@mozilla.org"],
|
||||
# mode="passing",
|
||||
# builders=["tag", "linux_build", "macosx_build", "sign", "stage"],
|
||||
# relayhost="smtp.mozilla.org"),
|
||||
#
|
||||
|
||||
####### DEBUGGING OPTIONS
|
||||
#c['debugPassword'] = "debugpassword"
|
||||
#from buildbot import manhole
|
||||
|
|
|
|||
|
|
@ -11,26 +11,26 @@ 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-1.8-master",""),
|
||||
("production-1.8-master",""),
|
||||
("staging-prometheus-vm", ""),
|
||||
("staging-prometheus-vm02", ""),
|
||||
("production-prometheus-vm", ""),
|
||||
("bm-xserve03", ""),
|
||||
("bm-xserve04", ""),
|
||||
("bm-xserve05", ""),
|
||||
("staging-pacifica-vm", ""),
|
||||
("staging-pacifica-vm02", ""),
|
||||
("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", ""),
|
||||
c['buildslaves'] = [
|
||||
BuildSlave("staging-1.8-master",""),
|
||||
BuildSlave("production-1.8-master",""),
|
||||
BuildSlave("staging-prometheus-vm", ""),
|
||||
BuildSlave("staging-prometheus-vm02", ""),
|
||||
BuildSlave("production-prometheus-vm", ""),
|
||||
BuildSlave("bm-xserve03", ""),
|
||||
BuildSlave("bm-xserve04", ""),
|
||||
BuildSlave("bm-xserve05", ""),
|
||||
BuildSlave("staging-pacifica-vm", ""),
|
||||
BuildSlave("staging-pacifica-vm02", ""),
|
||||
BuildSlave("production-pacifica-vm", ""),
|
||||
BuildSlave("staging-1.9-master",""),
|
||||
BuildSlave("fx-linux-1.9-slave1",""),
|
||||
BuildSlave("fx-win32-1.9-slave1", ""),
|
||||
BuildSlave("fx-mac-1.9-slave1", ""),
|
||||
BuildSlave("production-1.9-master",""),
|
||||
BuildSlave("fx-linux-1.9-slave2",""),
|
||||
BuildSlave("fx-win32-1.9-slave2", ""),
|
||||
BuildSlave("fx-mac-1.9-slave2", ""),
|
||||
]
|
||||
|
||||
# 'slavePortnum' defines the TCP port to listen on. This must match the value
|
||||
|
|
@ -44,11 +44,11 @@ c['slavePortnum'] = 9989
|
|||
# source code changes. Any class which implements IChangeSource can be added
|
||||
# to this list: there are several in buildbot/changes/*.py to choose from.
|
||||
|
||||
c['sources'] = []
|
||||
c['change_source'] = []
|
||||
|
||||
#from buildbot.changes import bonsaipoller
|
||||
#
|
||||
#c['sources'].append(
|
||||
#c['change_source'].append(
|
||||
# bonsaipoller.BonsaiPoller(
|
||||
# bonsaiURL = 'http://bonsai.mozilla.org',
|
||||
# module = 'AviarySuiteBranchTinderbox',
|
||||
|
|
@ -148,7 +148,7 @@ c['schedulers'].append(sign_depscheduler)
|
|||
c['schedulers'].append(update_depscheduler)
|
||||
c['schedulers'].append(stage_depscheduler)
|
||||
|
||||
c['sources'].append(PBChangeSource())
|
||||
c['change_source'].append(PBChangeSource())
|
||||
|
||||
####### BUILDERS
|
||||
|
||||
|
|
@ -669,17 +669,7 @@ c['status'] = []
|
|||
|
||||
from buildbot.status import html
|
||||
c['status'].append(
|
||||
html.Waterfall(http_port=8810, css='./mozilla.css')
|
||||
)
|
||||
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'],
|
||||
)
|
||||
html.WebStatus(http_port=8810)
|
||||
)
|
||||
|
||||
from buildbot.status import tinderbox
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче