Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge from default -> production

--HG--
branch : production-0.8
  • Loading branch information...
commit 2fbf72244308e588754075d10ddaec81bf7c3164 2 parents 410da2e + ec3357f
@lsblakk lsblakk authored
Showing with 8 additions and 4 deletions.
  1. +7 −4 misc.py
  2. +1 −0  status/errors.py
View
11 misc.py
@@ -684,10 +684,11 @@ def generateBranchObjects(config, name):
logUploadCmd = makeLogUploadCommand(name, config, is_try=config.get('enable_try'),
is_shadow=bool(name=='shadow-central'), platform_prop='stage_platform',product_prop='product')
+ # this comment is for grepping! SubprocessLogHandler
branchObjects['status'].append(QueuedCommandHandler(
logUploadCmd,
QueueDir.getQueue('commands'),
- builders=builders + unittestBuilders + debugBuilders,
+ builders=builders + unittestBuilders + debugBuilders + pgoBuilders,
))
if nightlyBuilders:
@@ -942,6 +943,7 @@ def generateBranchObjects(config, name):
Nightly,
[buildIDSchedFunc, buildUIDSchedFunc])(
name="%s pgo" % name,
+ branch=config['repo_path'],
builderNames=pgoBuilders,
hour=range(0,24,config['periodic_pgo_interval']),
)
@@ -2728,7 +2730,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
'properties': {
'branch': branchProperty,
'platform': slave_platform,
- 'stage_platform': stage_platform,
+ 'stage_platform': stage_platform + '-pgo',
'product': stage_product,
'builddir': builddir,
'slavebuilddir': slavebuilddir,
@@ -2777,8 +2779,8 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
pgo_builders.extend(generateTestBuilderNames(
'%s %s pgo test' % (platform_name, branch), suites_name, suites))
# Collect test builders for the TinderboxMailNotifier
- all_test_builders[tinderboxTree].extend(test_builders)
- all_builders.extend(test_builders)
+ all_test_builders[tinderboxTree].extend(test_builders + pgo_builders)
+ all_builders.extend(test_builders + pgo_builders)
triggeredUnittestBuilders.append(('tests-%s-%s-%s-unittest' % (branch, slave_platform, test_type),
test_builders, merge_tests))
@@ -2810,6 +2812,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
pgo_builder_kwargs = test_builder_kwargs.copy()
pgo_builder_kwargs['name_prefix'] = "%s %s pgo test" % (platform_name, branch)
pgo_builder_kwargs['build_dir_prefix'] += '_pgo'
+ pgo_builder_kwargs['stagePlatform'] += '-pgo'
branchObjects['builders'].extend(generateTestBuilder(**pgo_builder_kwargs))
for scheduler_name, test_builders, merge in triggeredUnittestBuilders:
View
1  status/errors.py
@@ -5,6 +5,7 @@
global_errors = ((re.compile("No space left on device"), RETRY),
(re.compile("Remote Device Error"), EXCEPTION),
(re.compile("Connection to the other side was lost in a non-clean fashion"), RETRY),
+ (re.compile("Automation Error:"), RETRY),
)
hg_errors = ((re.compile("abort: HTTP Error 5\d{2}"), RETRY),
(re.compile("abort: .*: no match found!"), RETRY),
Please sign in to comment.
Something went wrong with that request. Please try again.