Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 414701 - create buildbot steps for trunk win32, fix bonsai poller

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@244416 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rcampbell%mozilla.com 2008-01-30 00:15:45 +00:00
parent f2d07ecefb
commit b9084786c0
2 changed files with 200 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
mozilla/tools/buildbot-configs/testing/sisyphus/master.cfg
View File

@ -49,7 +49,9 @@ c['bots'] = [("qm-jstest01", "mozilla"),
("papaya", "mozilla"),
("pineapple", "mozilla"),
("pear", "mozilla"),
("plum", "mozilla")]
("plum", "mozilla"),
("qm-winxp02", "mozilla"),
("qm-winxp03", "mozilla")]
##
## Status
@ -78,13 +80,13 @@ c['sources'] = []
c['sources'].append(bonsaipoller.BonsaiPoller(
bonsaiURL = "http://bonsai.mozilla.org",
module = "PhoenixTinderbox",
branch = "1.9",
branch = "HEAD",
pollInterval = 1 * 60))
c['sources'].append(bonsaipoller.BonsaiPoller(
bonsaiURL = "http://bonsai.mozilla.org",
module = "AviarySuiteBranchTinderbox",
branch = "1.8.1",
branch = "MOZILLA_1_8_BRANCH",
pollInterval = 1 * 60))
####### SCHEDULERS
@ -93,6 +95,7 @@ c['sources'].append(bonsaipoller.BonsaiPoller(
builderLinuxQmJstest0119Shell = "jstest linux qm-jstest01 1.9 shell"
builderOSXPPCPineapple19Shell = "jstest os x ppc pineapple 1.9 shell"
builderWin32QmWinxp0319Shell = "jstest win32 qm-winxp03 1.9 shell"
from buildbot.scheduler import Scheduler
c['schedulers'] = []
@ -101,23 +104,26 @@ builderOSXPPCPapaya181Shell = "jstest os x ppc papaya 1.8.1 shell"
builderLinuxPlum181Shell = "jstest linux plum 1.8.1 shell"
c['schedulers'].append(Scheduler(name="shell 1.8.1 bonsai",
branch="1.8.1",
branch="MOZILLA_1_8_BRANCH",
treeStableTimer=2*60,
builderNames=[builderLinuxPlum181Shell,
builderOSXPPCPapaya181Shell]))
c['schedulers'].append(Scheduler(name="shell 1.9 bonsai",
branch="1.9",
branch="HEAD",
treeStableTimer=2*60,
builderNames=[builderLinuxQmJstest0119Shell,
builderOSXPPCPineapple19Shell]))
builderOSXPPCPineapple19Shell,
builderWin32QmWinxp0319Shell]))
builderLinuxQmJstest0119BrowserDebug = "jstest linux qm-jstest01 1.9 browser debug"
builderOSXPPCPineapple19BrowserDebug = "jstest os x ppc pineapple 1.9 browser debug"
builderWindowsQmWinxp0319BrowserDebug = "jstest win32 qm-winxp03 1.9 browser debug"
c['schedulers'].append(Nightly(name="nightly 1.9 browser debug", branch="1.9",
builderNames=[builderLinuxQmJstest0119BrowserDebug,
builderOSXPPCPineapple19BrowserDebug],
builderOSXPPCPineapple19BrowserDebug,
builderWindowsQmWinxp0319BrowserDebug],
hour=0, minute=0))
builderLinuxPear181BrowserDebug = "jstest linux pear 1.8.1 browser debug"
@ -130,10 +136,12 @@ c['schedulers'].append(Nightly(name="nightly 1.8.1 browser debug", branch="1.8.1
builderLinuxQmJstest0119BrowserOpt = "jstest linux qm-jstest01 1.9 browser opt"
builderOSXPPCPineapple19BrowserOpt = "jstest os x ppc pineapple 1.9 browser opt"
builderWindowsQmWinxp0319BrowserOpt = "jstest win32 qm-winxp03 1.9 browser opt"
c['schedulers'].append(Nightly(name="nightly 1.9 browser opt", branch="1.9",
builderNames=[builderLinuxQmJstest0119BrowserOpt,
builderOSXPPCPineapple19BrowserOpt],
builderOSXPPCPineapple19BrowserOpt,
builderWindowsQmWinxp0319BrowserOpt],
hour=5, minute=0))
builderLinuxPear181BrowserOpt = "jstest linux pear 1.8.1 browser opt"
@ -618,4 +626,123 @@ sisyphus_trunk_debug_browser_macppc_builder = {
builders.append(sisyphus_trunk_debug_browser_macppc_builder)
c['builders'] = builders
# Windows Trunk
SISYPHUS_BASE_WIN = "C:\\work\\mozilla\\mozilla.com\\test.mozilla.com\\www"
windowsJS19ShellFactory = factory.BuildFactory()
windowsJS19ShellFactory.addStep(CygwinBashShellCommand, name="Update Sisyphus",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19ShellFactory.addStep(CygwinBashShellCommand, name="Update JS Tests",
workdir=SISYPHUS_BASE_WIN + "\\tests\\mozilla.org\\js",
flunkOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19ShellFactory.addStep(CygwinBashShellCommand, name="Create reports directory",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
command=["mkdir", "-p", "results"],
env=MozillaEnvironments['windows'])
windowsJS19ShellFactory.addStep(SisyphusJSTestWin, name="js debug",
workdir = SISYPHUS_BASE_WIN,
buildType = 'debug',
branch = "1.9.0",
timeout= 60 * 60,
env=MozillaEnvironments['windows'])
windowsJS19ShellFactory.addStep(SisyphusJSTestWin, name="js opt",
workdir = SISYPHUS_BASE_WIN,
buildType = 'opt',
branch = "1.9.0",
timeout = 60 * 60,
env=MozillaEnvironments['windows'])
windowsJS19BrowserOptFactory = factory.BuildFactory()
windowsJS19BrowserOptFactory.addStep(CygwinBashShellCommand, name="Update Sisyphus",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
warnOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19BrowserOptFactory.addStep(CygwinBashShellCommand, name="Update JS Tests",
workdir=SISYPHUS_BASE_WIN + "/tests/mozilla.org/js",
flunkOnFailure=False,
warnOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19BrowserOptFactory.addStep(CygwinBashShellCommand, name="Create reports directory",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
warnOnFailure=False,
command=["mkdir", "-p", "results"])
windowsJS19BrowserOptFactory.addStep(SisyphusBrowserTestWin, name="browser opt",
workdir=SISYPHUS_BASE_WIN,
timeout=60*60*8,
buildType="opt",
env=MozillaEnvironments['windows'])
windowsJS19BrowserDebugFactory = factory.BuildFactory()
windowsJS19BrowserDebugFactory.addStep(CygwinBashShellCommand, name="Update Sisyphus",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
warnOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19BrowserDebugFactory.addStep(CygwinBashShellCommand, name="Update JS Tests",
workdir=SISYPHUS_BASE_WIN + "/tests/mozilla.org/js",
flunkOnFailure=False,
warnOnFailure=False,
command=["cvs", "update", "-d", "-P"],
env=MozillaEnvironments['windows'])
windowsJS19BrowserDebugFactory.addStep(CygwinBashShellCommand, name="Create reports directory",
workdir=SISYPHUS_BASE_WIN,
flunkOnFailure=False,
warnOnFailure=False,
command=["mkdir", "-p", "results"])
windowsJS19BrowserDebugFactory.addStep(SisyphusBrowserTestWin, name="browser debug",
workdir=SISYPHUS_BASE_WIN,
timeout=60*60*8,
buildType="debug",
env=MozillaEnvironments['windows'])
qmwinxp03Lock = SlaveLock(name='qm-winxp03 lock', maxCount=1, maxCountForSlave={"qm-winxp03": 1})
sisyphus_trunk_js_win32_builder = {
'name': builderWin32QmWinxp0319Shell,
'slavenames': ['qm-winxp03'],
'builddir': "trunk_js_win32",
'factory': windowsJS19ShellFactory,
'category': "Sisyphus",
'locks': [qmwinxp03Lock]
}
builders.append(sisyphus_trunk_js_win32_builder)
sisyphus_trunk_opt_browser_win32_builder = {
'name': builderWindowsQmWinxp0319BrowserOpt,
'slavenames': ['qm-winxp03'],
'builddir': "trunk_opt_browser_win32",
'factory': windowsJS19BrowserOptFactory,
'category': "Sisyphus",
'locks': [qmwinxp03Lock]
}
builders.append(sisyphus_trunk_opt_browser_win32_builder)
sisyphus_trunk_debug_browser_win32_builder = {
'name': builderWindowsQmWinxp0319BrowserDebug,
'slavenames': ['qm-winxp03'],
'builddir': "trunk_debug_browser_win32",
'factory': windowsJS19BrowserDebugFactory,
'category': "Sisyphus",
'locks': [qmwinxp03Lock]
}
builders.append(sisyphus_trunk_debug_browser_win32_builder)
c['builders'] = builders

64
mozilla/tools/buildbot-configs/testing/sisyphus/sisyphus.py
View File

@ -17,6 +17,21 @@ MozillaEnvironments['macosxppc'] = {
"CVS_RSH": 'ssh'
}
MozillaEnvironments['windows'] = {
"MOZ_NO_REMOTE": '1',
"NO_EM_RESTART": '1',
"XPCOM_DEBUG_BREAK": 'warn',
"MOZ_TOOLS": 'C:\\moztools',
"CYGWINBASE": 'C:\\work\\cygwin',
"CVS_RSH": 'ssh',
"PATH": 'C:\\Python24;' + \
'C:\\Python24\\Scripts;' + \
'C:\\work\\cygwin\\bin;' + \
'C:\\WINDOWS\\System32;' + \
'C:\\WINDOWS;' + \
'C:\\WINDOWS\\System32\\Wbem;'
}
class SisyphusJSTest(ShellCommand):
name = "jstest"
description = ["jstest"]
@ -59,3 +74,52 @@ class SisyphusBrowserTest(SisyphusJSTest):
descriptionDone = ["browsertest complete"]
product = "firefox"
class CygwinBashShellCommand(ShellCommand):
def start(self):
commandString = ' '.join(self.command)
self.setCommand("bash -c " + "'" + commandString + "'")
ShellCommand.start(self)
class SisyphusJSTestWin(CygwinBashShellCommand):
name = "jstest"
description = ["jstest"]
descriptionDone = ["jstest complete"]
product = "js"
def __init__(self, **kwargs):
self.flunkOnFailure = True
self.warnOnWarnings = True
self.warnOnFailure = True
if 'buildType' in kwargs:
self.buildType = kwargs['buildType']
else:
self.buildType = "opt"
if 'branch' in kwargs:
self.branch = kwargs['branch']
else:
self.branch = "1.9.0"
ShellCommand.__init__(self, **kwargs)
def start(self):
self.command = ["./tests/mozilla.org/js/runtests.sh",
"-p", self.product, "-b", self.branch,
"-T", self.buildType, "-B", '"checkout build"', "-S"]
CygwinBashShellCommand.start(self)
def evaluateCommand(self, cmd):
superResult = ShellCommand.evaluateCommand(self, cmd)
if SUCCESS != superResult:
return WARNINGS
if re.search('TEST_RESULT=FAILED', cmd.logs['stdio'].getText()):
return WARNINGS
return SUCCESS
class SisyphusBrowserTestWin(SisyphusJSTestWin):
name = "browsertest"
description = ["browsertest"]
descriptionDone = ["browsertest complete"]
product = "firefox"