Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   2597:d62f03c272db
parent:      2595:0304188eeaf9
user:        Phil Ringnalda <philringnalda@gmail.com>
date:        Mon Sep 17 10:23:05 2012 -0700
summary:     Bug 791477 - Set RETRY for "Unable to ping tegra after 5 attempts" failures, r=bhearsum

changeset:   2598:3d29d0dcc378
tag:         tip
user:        Justin Wood <Callek@gmail.com>
date:        Mon Sep 17 19:06:06 2012 -0400
summary:     Bug 791854 - Remove references to android noion in buildbotcustom, by partially backing out changeset 0304188eeaf9. r=aki

--HG--
branch : production-0.8
  • Loading branch information...
commit e0dc9d9555df7a35540469afdebd4794da876abf 2 parents 61eb9be + b9c3d1c
@ccooper ccooper authored
Showing with 7 additions and 6 deletions.
  1. +4 −5 process/factory.py
  2. +3 −1 status/errors.py
View
9 process/factory.py
@@ -259,7 +259,6 @@ def getPlatformMinidumpPath(platform):
'macosx64_gecko': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
# Android uses OSX because the Foopies are OSX.
'android': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
- 'android-noion': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
# Pandas will run on Linux Foopies.
'android-armv6': WithProperties('%(toolsdir:-)s/breakpad/linux/minidump_stackwalk'),
}
@@ -4933,6 +4932,7 @@ def addInitialSteps(self):
command=['python', '/builds/sut_tools/verify.py'],
workdir='build',
haltOnFailure=True,
+ log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
))
self.addStep(SetProperty(
name="GetFoopyPlatform",
@@ -5642,10 +5642,9 @@ def addSetupSteps(self):
def addPluginInstallSteps(self):
if self.plugins:
#32 bit (includes mac browsers)
- if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android',
- 'tegra_android-armv6', 'tegra_android-noion',
- 'leopard', 'snowleopard', 'leopard-o', 'lion',
- 'mountainlion'):
+ if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', \
+ 'tegra_android-armv6', 'leopard', 'snowleopard', \
+ 'leopard-o', 'lion', 'mountainlion'):
self.addStep(DownloadFile(
url=WithProperties("%s/%s" % (self.supportUrlBase, self.plugins['32'])),
workdir=os.path.join(self.workdirBase, "talos/base_profile"),
View
4 status/errors.py
@@ -32,4 +32,6 @@
(re.compile("ERROR: We tried to download the talos.json file but something failed"), RETRY),
)
-tegra_errors = ((re.compile("Automation error: Error"), FAILURE),)
+tegra_errors = ((re.compile("Automation error: Error receiving data from socket"), FAILURE),
+ (re.compile("Unable to ping tegra after 5 attempts"), RETRY),
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.