Permalink
Browse files

Merge bugs 561754, 732516, 732468, 733102, and the backout of bug 660…

…480 to production-0.8 branch.

--HG--
branch : production-0.8
  • Loading branch information...
2 parents af7f40d + 98102c5 commit 8dc43a148d316467c0e1df2af0c2e79e7678d2ea @mozbhearsum mozbhearsum committed Mar 6, 2012
Showing with 9 additions and 16 deletions.
  1. +2 −2 misc.py
  2. +3 −4 process/factory.py
  3. +3 −5 process/release.py
  4. +1 −5 status/errors.py
View
4 misc.py
@@ -394,8 +394,8 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
buildToolsRepoPath=config['build_tools_repo_path'],
branchName=branch_name,
remoteExtras=pf.get('remote_extras'),
- downloadSymbols=pf.get('download_symbols', True),
- downloadSymbolsOnDemand=pf.get('download_symbols_ondemand', False),
+ downloadSymbols=pf.get('download_symbols', False),
+ downloadSymbolsOnDemand=pf.get('download_symbols_ondemand', True),
)
builder = {
'name': '%s %s' % (name_prefix, suites_name),
View
7 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, \
@@ -6427,7 +6427,7 @@ def __init__(self, cvsroot, stagingServer, productName, version,
'--exclude=unsigned',
'--exclude=update',
'--exclude=*.crashreporter-symbols.zip',
- '--exclude=*.tests.zip',
+ '--exclude=*.zip',
'--exclude=*.tests.tar.bz2',
'--exclude=*.txt',
'--exclude=logs',
@@ -6458,7 +6458,7 @@ def __init__(self, cvsroot, stagingServer, productName, version,
'--exclude=unsigned',
'--exclude=update',
'--exclude=*.crashreporter-symbols.zip',
- '--exclude=*.tests.zip',
+ '--exclude=*.zip',
'--exclude=*.tests.tar.bz2',
'--exclude=*.txt',
'--exclude=logs',
@@ -7054,7 +7054,6 @@ def addSetupSteps(self):
command=['python', '/builds/sut_tools/cleanup.py',
WithProperties("%(sut_ip)s"),
],
- log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
haltOnFailure=True)
)
self.addStep(ShellCommand(
View
8 process/release.py
@@ -63,6 +63,7 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
# config file bumps
runtimeTag = getRuntimeTag(releaseTag)
l10nChunks = releaseConfig.get('l10nChunks', DEFAULT_PARALLELIZATION)
+ releaseChannel = releaseConfig.get('releaseChannel', 'release')
updateVerifyChunks = releaseConfig.get('updateVerifyChunks', DEFAULT_PARALLELIZATION)
tools_repo_path = releaseConfig.get('build_tools_repo_path',
branchConfig['build_tools_repo_path'])
@@ -535,8 +536,7 @@ def majorUpdateVerifyBuilders(platform):
if not releaseConfig.get('skip_build'):
platform_env = pf['env'].copy()
- if 'update_channel' in branchConfig:
- platform_env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel']
+ platform_env['MOZ_UPDATE_CHANNEL'] = releaseChannel
if platform in releaseConfig['l10nPlatforms']:
triggeredSchedulers = [builderPrefix('%s_repack' % platform)]
else:
@@ -629,8 +629,7 @@ def majorUpdateVerifyBuilders(platform):
if platform in releaseConfig['l10nPlatforms']:
env = builder_env.copy()
env.update(pf['env'])
- if 'update_channel' in branchConfig:
- env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel']
+ env['MOZ_UPDATE_CHANNEL'] = releaseChannel
if not releaseConfig.get('disableStandaloneRepacks'):
extra_args = [platform, branchConfigFile]
@@ -914,7 +913,6 @@ def majorUpdateVerifyBuilders(platform):
if releaseConfig.get('verifyConfigs') and \
not releaseConfig.get('skip_updates'):
- releaseChannel = releaseConfig.get('releaseChannel', branchConfig['update_channel'])
updates_factory = ReleaseUpdatesFactory(
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
View
6 status/errors.py
@@ -12,6 +12,7 @@
(re.compile("abort: .*: no match found!"), RETRY),
(re.compile("abort: Connection reset by peer"), RETRY),
(re.compile("transaction abort!"), RETRY),
+ (re.compile("abort: error:"), RETRY),
)
purge_error = ((re.compile("Error: unable to free"), RETRY),)
@@ -25,8 +26,3 @@
(re.compile("Connection refused"), RETRY),
(re.compile("Connection reset by peer"), RETRY),
)
-
-tegra_errors = ((re.compile("process killed by signal"), RETRY),
- (re.compile("Remote Device Error"), RETRY),
- (re.compile("devicemanager.DMError"), RETRY),
- )

0 comments on commit 8dc43a1

Please sign in to comment.