--- a/misc.py
+++ b/misc.py
@@ -3330,19 +3330,17 @@ def generateReleasePromotionObjects(conf
status = []
buildObjects = {
'builders': builders,
'schedulers': schedulers,
'status': status,
'change_source': change_sources,
}
- topLevelBuilders = []
pf_linux64 = config['platforms']['linux64']
- pf_macosx64 = config['platforms']['macosx64']
signing_servers = secrets.get(pf_linux64.get('dep_signing_servers'))
# source builder
source_buildername = '%s_source' % name
source_factory = makeMHFactory(config, pf_linux64,
mh_cfg=pf_linux64['mozharness_desktop_build'],
extra_args=pf_linux64['mozharness_desktop_build'].get('extra_args', []) + \
['--custom-build-variant-cfg', 'source'],
@@ -3358,62 +3356,11 @@ def generateReleasePromotionObjects(conf
'properties': {
'branch': name,
'platform': 'source',
'product': config['product_name'],
'repo_path': config['repo_path'],
'script_repo_revision': config["mozharness_tag"],
},
}
- topLevelBuilders.append(source_buildername)
builders.append(source_builder)
- # partner repacks
- base_partner_repack_params = dict(
- hgHost=config['hghost'],
- repoPath=config['repo_path'],
- buildToolsRepoPath=config['build_tools_repo_path'],
- productName=config['product_name'],
- partnersRepoPath=config['partners_repo_path'],
- partnersRepoRevision='default',
- stagingServer=config['stage_server'],
- stageUsername=config['stage_username'],
- stageSshKey=config['stage_ssh_key'],
- signingServers=signing_servers,
- env=pf_macosx64['env'],
- nightlyDir=None,
- releasePromotion=True,
- )
- for platform in config['partner_repack_platforms']:
- partner_repack_params = base_partner_repack_params.copy()
- partner_repack_params['platformList'] = [platform]
- partner_repack_factory = PartnerRepackFactory(**partner_repack_params)
-
- partner_buildername = '%s_%s_partner_repack' % (name, platform)
- builders.append({
- 'name': partner_buildername,
- 'slavenames': pf_macosx64['slaves'],
- 'category': name,
- 'builddir': partner_buildername,
- 'slavebuilddir': normalizeName(partner_buildername, config['product_name']),
- 'factory': partner_repack_factory,
- 'properties': {
- 'slavebuilddir': normalizeName(partner_buildername, config['product_name']),
- 'branch': name,
- 'platform': platform,
- 'product': config['product_name'],
- }
- })
- topLevelBuilders.append(partner_buildername)
-
- # To add longer-term: l10n repacks, funsize partials, antivirus, checksums etc
-
- # sendchange listener
- starting_scheduler = Scheduler(
- name='%s_start_promotion' % name,
- branch='%s-release-promotion' % name,
- treeStableTimer=None,
- builderNames=topLevelBuilders,
- )
- schedulers.append(starting_scheduler)
-
return buildObjects
-