Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   2662:ade8d606462d
parent:      2660:0ec5d68c3b12
user:        Justin Wood <Callek@gmail.com>
date:        Fri Oct 05 13:30:31 2012 -0400
summary:     Bug 797679 - Force reboot.py for mobile jobs to never retry on failure. r=armenzg

changeset:   2663:ae9b7711c605
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Oct 05 14:47:45 2012 -0400
summary:     Bug 790741. Backout all changes since uploading on try is failing. r=bustage

--HG--
branch : production-0.8
  • Loading branch information...
commit 902316df1407c80748ae023acab883aba0d1e2f7 2 parents 0cbde16 + b1208ca
@rail rail authored
Showing with 6 additions and 9 deletions.
  1. +0 −3  misc.py
  2. +6 −6 process/factory.py
View
3  misc.py
@@ -968,7 +968,6 @@ def generateBranchObjects(config, name, secrets=None):
uploadPackages = pf.get('uploadPackages', True)
uploadSymbols = False
- disableSymbols = pf.get('disable_symbols', False)
packageTests = False
talosMasters = pf.get('talos_masters', [])
unittestBranch = "%s-%s-opt-unittest" % (name, platform)
@@ -1090,7 +1089,6 @@ def generateBranchObjects(config, name, secrets=None):
'codesighs': codesighs,
'uploadPackages': uploadPackages,
'uploadSymbols': uploadSymbols,
- 'disableSymbols': disableSymbols,
'buildSpace': buildSpace,
'clobberURL': config['base_clobber_url'],
'clobberTime': clobberTime,
@@ -1344,7 +1342,6 @@ def generateBranchObjects(config, name, secrets=None):
doBuildAnalysis=doBuildAnalysis,
uploadPackages=uploadPackages,
uploadSymbols=pf.get('upload_symbols', False),
- disableSymbols=pf.get('disable_symbols', False),
nightly=True,
createSnippet=create_snippet,
createPartial=pf.get('create_partial', config['create_partial']),
View
12 process/factory.py
@@ -202,7 +202,7 @@ def parse_make_upload(rc, stdout, stderr):
the upload make target and returns a dictionary of important
file urls.'''
retval = {}
- for m in re.findall("^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar|tar\.gz))$",
+ for m in re.findall("^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar))$",
"\n".join([stdout, stderr]), re.M):
if 'devel' in m and m.endswith('.rpm'):
retval['develRpmUrl'] = m
@@ -716,7 +716,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
triggeredSchedulers=None, triggerBuilds=False,
mozconfigBranch="production", useSharedCheckouts=False,
stagePlatform=None, testPrettyNames=False, l10nCheckTest=False,
- disableSymbols=False,
doBuildAnalysis=False,
downloadSubdir=None,
multiLocale=False,
@@ -784,7 +783,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
self.baseName = baseName
self.uploadPackages = uploadPackages
self.uploadSymbols = uploadSymbols
- self.disableSymbols = disableSymbols
self.createSnippet = createSnippet
self.createPartial = createPartial
self.doCleanup = doCleanup
@@ -939,7 +937,7 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
self.multiLocale = multiLocale
self.addBuildSteps()
- if self.uploadSymbols or (not self.disableSymbols and (self.packageTests or self.leakTest)):
+ if self.uploadSymbols or self.packageTests or self.leakTest:
self.addBuildSymbolsStep()
if self.uploadSymbols:
self.addUploadSymbolsStep()
@@ -5257,6 +5255,7 @@ def addTearDownSteps(self):
command=['python', '-u', '/builds/sut_tools/reboot.py',
WithProperties("%(sut_ip)s"),
],
+ log_eval_func=lambda c,s: SUCCESS,
))
class TalosFactory(RequestSortingBuildFactory):
@@ -5932,8 +5931,9 @@ def do_disconnect(cmd):
command=['python', '-u', '/builds/sut_tools/reboot.py',
WithProperties("%(sut_ip)s"),
],
- env=self.env)
- )
+ env=self.env,
+ log_eval_func=lambda c,s: SUCCESS,
+ ))
else:
#the following step is to help the linux running on mac minis reboot cleanly
#see bug561442
Please sign in to comment.
Something went wrong with that request. Please try again.