Browse files

Merge backout from default

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 7948586 + ca741b3 commit a98d017967f449b373a3ce80fa0b99b9e3f67161 @nthomas-mozilla nthomas-mozilla committed Feb 1, 2012
Showing with 61 additions and 90 deletions.
  1. +6 −11 process/factory.py
  2. +0 −9 status/errors.py
  3. +5 −11 steps/talos.py
  4. +50 −59 steps/unittest.py
View
17 process/factory.py
@@ -50,7 +50,7 @@
reload(release.paths)
from buildbotcustom.status.errors import purge_error, global_errors, \
- upload_errors, tegra_errors
+ upload_errors
from buildbotcustom.steps.base import ShellCommand, SetProperty, Mercurial, \
Trigger, RetryingShellCommand, RetryingSetProperty
from buildbotcustom.steps.misc import TinderboxShellCommand, SendChangeStep, \
@@ -7046,17 +7046,14 @@ def addSetupSteps(self):
workdir='build/hostutils',
name='unpack_hostutils',
))
- self.addStep(RetryingShellCommand(
+ self.addStep(ShellCommand(
name='cleanup device',
workdir='.',
description="Cleanup Device",
command=['python', '/builds/sut_tools/cleanup.py',
WithProperties("%(sut_ip)s"),
],
- haltOnFailure=True,
- flunkOnFailure=True,
- log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
- )
+ haltOnFailure=True)
)
self.addStep(ShellCommand(
name='install app on device',
@@ -7378,18 +7375,16 @@ def addCleanupSteps(self):
env=self.env)
)
if self.remoteTests:
- self.addStep(RetryingShellCommand(
+ self.addStep(ShellCommand(
name='cleanup device',
workdir=self.workdirBase,
description="Cleanup Device",
command=['python', '/builds/sut_tools/cleanup.py',
WithProperties("%(sut_ip)s"),
],
env=self.env,
- haltOnFailure=True,
- flunkOnFailure=True,
- log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
- ))
+ haltOnFailure=True)
+ )
if not self.remoteTests:
self.addStep(DownloadFile(
url=WithProperties("%s/tools/buildfarm/maintenance/count_and_reboot.py" % self.supportUrlBase),
View
9 status/errors.py
@@ -25,12 +25,3 @@
(re.compile("Connection refused"), RETRY),
(re.compile("Connection reset by peer"), RETRY),
)
-
-tegra_errors = (
- (re.compile("process killed by signal 9"), RETRY), # bug
- (re.compile("process killed by signal 15"), RETRY), # bug
- (re.compile("FAIL: failed to initialize browser"), RETRY), # bug 686085
- (re.compile("FAIL: timeout exceeded"), EXCEPTION), # bug 675297
- (re.compile("command timed out: 1200 seconds without output, killing pid"), RETRY), # bug
- (re.compile("Timed out while waiting for server startup."), RETRY), # bug 687098
- )
View
16 steps/talos.py
@@ -1,11 +1,8 @@
import re, os, time, copy
from buildbot.steps.shell import WithProperties
from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, SKIPPED, EXCEPTION, worst_status
-from buildbot.process.buildstep import regex_log_evaluator
-
-from buildbotcustom.steps.base import ShellCommand, RetryingShellCommand
-from buildbotcustom.status.errors import tegra_errors
+from buildbotcustom.steps.base import ShellCommand
class MozillaUpdateConfig(ShellCommand):
"""Configure YAML file for run_tests.py"""
@@ -96,15 +93,12 @@ def evaluateCommand(self, cmd):
self.setProperty("configFile", configFileMatch.group(1))
return SUCCESS
-class MozillaRunPerfTests(RetryingShellCommand):
+class MozillaRunPerfTests(ShellCommand):
"""Run the performance tests"""
name = "Run performance tests"
- def __init__(self, log_eval_func=None, **kwargs):
- self.super_class = RetryingShellCommand
- if not log_eval_func:
- log_eval_func = lambda c,s: regex_log_evaluator(c, s, tegra_errors)
- RetryingShellCommand.__init__(self, log_eval_func=log_eval_func,
- **kwargs)
+ def __init__(self, **kwargs):
+ self.super_class = ShellCommand
+ self.super_class.__init__(self, **kwargs)
def createSummary(self, log):
summary = []
View
109 steps/unittest.py
@@ -27,12 +27,10 @@
import re
-from buildbot.process.buildstep import regex_log_evaluator
from buildbot.steps.shell import WithProperties
from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, HEADER, worst_status
-from buildbotcustom.steps.base import ShellCommand, RetryingShellCommand
-from buildbotcustom.status.errors import tegra_errors
+from buildbotcustom.steps.base import ShellCommand
cvsCoLog = "cvsco.log"
tboxClobberCvsCoLog = "tbox-CLOBBER-cvsco.log"
@@ -881,51 +879,46 @@ def evaluateCommand(self, cmd):
return SUCCESS
-class RemoteMochitestStep(MochitestMixin, ChunkingMixin, RetryingShellCommand):
+class RemoteMochitestStep(MochitestMixin, ChunkingMixin, ShellCommandReportTimeout):
def __init__(self, variant, symbols_path=None, testPath=None,
xrePath='../hostutils/xre', testManifest=None,
utilityPath='../hostutils/bin', certificatePath='certs',
app='org.mozilla.fennec', consoleLevel='INFO',
- totalChunks=None, thisChunk=None,
- log_eval_func=None, **kwargs):
+ totalChunks=None, thisChunk=None, **kwargs):
+ self.super_class = ShellCommandReportTimeout
+ ShellCommandReportTimeout.__init__(self, **kwargs)
if totalChunks:
assert 1 <= thisChunk <= totalChunks
- self.name = 'mochitest-%s' % variant
- command = ['python', 'mochitest/runtestsremote.py',
- '--deviceIP', WithProperties('%(sut_ip)s'),
- '--xre-path', xrePath,
- '--utility-path', utilityPath,
- '--certificate-path', certificatePath,
- '--app', app,
- '--console-level', consoleLevel,
- '--http-port', WithProperties('%(http_port)s'),
- '--ssl-port', WithProperties('%(ssl_port)s'),
- '--pidfile', WithProperties('%(basedir)s/../runtestsremote.pid')
- ]
- command.extend(self.getVariantOptions(variant))
- if testPath:
- command.extend(['--test-path', testPath])
- if testManifest:
- command.extend(['--run-only-tests', testManifest])
- if symbols_path:
- command.append(WithProperties("--symbols-path=../%s" % symbols_path))
- command.extend(self.getChunkOptions(totalChunks, thisChunk))
-
- self.super_class = RetryingShellCommand
- if not log_eval_func:
- log_eval_func = lambda c,s: regex_log_evaluator(c, s, tegra_errors)
- RetryingShellCommand.__init__(self, command=command,
- log_eval_func=log_eval_func, **kwargs)
-
self.addFactoryArguments(variant=variant, symbols_path=symbols_path,
testPath=testPath, xrePath=xrePath,
testManifest=testManifest, utilityPath=utilityPath,
certificatePath=certificatePath, app=app,
consoleLevel=consoleLevel,
totalChunks=totalChunks, thisChunk=thisChunk)
+ self.name = 'mochitest-%s' % variant
+ self.command = ['python', 'mochitest/runtestsremote.py',
+ '--deviceIP', WithProperties('%(sut_ip)s'),
+ '--xre-path', xrePath,
+ '--utility-path', utilityPath,
+ '--certificate-path', certificatePath,
+ '--app', app,
+ '--console-level', consoleLevel,
+ '--http-port', WithProperties('%(http_port)s'),
+ '--ssl-port', WithProperties('%(ssl_port)s'),
+ '--pidfile', WithProperties('%(basedir)s/../runtestsremote.pid')
+ ]
+ self.command.extend(self.getVariantOptions(variant))
+ if testPath:
+ self.command.extend(['--test-path', testPath])
+ if testManifest:
+ self.command.extend(['--run-only-tests', testManifest])
+ if symbols_path:
+ self.command.append(WithProperties("--symbols-path=../%s" % symbols_path))
+ self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
+
class RemoteMochitestBrowserChromeStep(RemoteMochitestStep):
def __init__(self, **kwargs):
@@ -941,38 +934,36 @@ def evaluateCommand(self, cmd):
superResult)
-class RemoteReftestStep(ReftestMixin, ChunkingMixin, RetryingShellCommand):
+class RemoteReftestStep(ReftestMixin, ChunkingMixin, ShellCommandReportTimeout):
def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
utilityPath='../hostutils/bin', app='org.mozilla.fennec',
- totalChunks=None, thisChunk=None, cmdOptions=None,
- log_eval_func=None, **kwargs):
+ totalChunks=None, thisChunk=None, cmdOptions=None, **kwargs):
+ self.super_class = ShellCommandReportTimeout
+ ShellCommandReportTimeout.__init__(self, **kwargs)
+ self.addFactoryArguments(suite=suite, xrePath=xrePath,
+ symbols_path=symbols_path,
+ utilityPath=utilityPath, app=app,
+ totalChunks=totalChunks, thisChunk=thisChunk,
+ cmdOptions=cmdOptions)
+
self.name = suite
if totalChunks:
self.name += '-%i' % thisChunk
- command = ['python', 'reftest/remotereftest.py',
- '--deviceIP', WithProperties('%(sut_ip)s'),
- '--xre-path', xrePath,
- '--utility-path', utilityPath,
- '--app', app,
- '--http-port', WithProperties('%(http_port)s'),
- '--ssl-port', WithProperties('%(ssl_port)s'),
- '--pidfile', WithProperties('%(basedir)s/../remotereftest.pid'),
- '--enable-privilege'
- ]
+ self.command = ['python', 'reftest/remotereftest.py',
+ '--deviceIP', WithProperties('%(sut_ip)s'),
+ '--xre-path', xrePath,
+ '--utility-path', utilityPath,
+ '--app', app,
+ '--http-port', WithProperties('%(http_port)s'),
+ '--ssl-port', WithProperties('%(ssl_port)s'),
+ '--pidfile', WithProperties('%(basedir)s/../remotereftest.pid'),
+ '--enable-privilege'
+ ]
if cmdOptions:
- command.extend(cmdOptions)
- command.extend(self.getChunkOptions(totalChunks, thisChunk))
- command.extend(self.getSuiteOptions(suite))
+ self.command.extend(cmdOptions)
+ self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
+ self.command.extend(self.getSuiteOptions(suite))
if symbols_path:
- command.append(WithProperties("--symbols-path=../%s" % symbols_path))
- self.super_class = RetryingShellCommand
- if not log_eval_func:
- log_eval_func = lambda c,s: regex_log_evaluator(c, s, tegra_errors)
- RetryingShellCommand.__init__(self, command=command, log_eval_func=log_eval_func, **kwargs)
+ self.command.append(WithProperties("--symbols-path=../%s" % symbols_path))
- self.addFactoryArguments(suite=suite, xrePath=xrePath,
- symbols_path=symbols_path,
- utilityPath=utilityPath, app=app,
- totalChunks=totalChunks, thisChunk=thisChunk,
- cmdOptions=cmdOptions)

0 comments on commit a98d017

Please sign in to comment.