Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
Bug 607392 - split tagging into en-US and other. Backed out revisions…
Browse files Browse the repository at this point in the history 
… 60b06686c840 and f84a95d878d6

--HG--
branch : production-0.8
extra : transplant_source : sC%7BL1%5B%5CI%AEz/%40T%F4%90%9DD%E4%03%12
  • Loading branch information
Rail Aliiev committed Feb 15, 2012
1 parent a6d00de commit f92a5a4
Showing 1 changed file with 29 additions and 78 deletions.
107 changes: 29 additions & 78 deletions process/release.py
View file
Expand Up @@ -383,74 +383,39 @@ def majorUpdateVerifyBuilders(platform):
} }
}) })


dummy_tag_builders=[]
if not releaseConfig.get('skip_tag'): if not releaseConfig.get('skip_tag'):
pf = branchConfig['platforms']['linux'] pf = branchConfig['platforms']['linux']
tag_env = builder_env.copy() tag_env = builder_env.copy()
if pf['env'].get('HG_SHARE_BASE_DIR', None): if pf['env'].get('HG_SHARE_BASE_DIR', None):
tag_env['HG_SHARE_BASE_DIR'] = pf['env']['HG_SHARE_BASE_DIR'] tag_env['HG_SHARE_BASE_DIR'] = pf['env']['HG_SHARE_BASE_DIR']


# Other includes mozharness, required for Mobile Builds tag_factory = ScriptFactory(
tag_source_factory = ScriptFactory(
scriptRepo=tools_repo, scriptRepo=tools_repo,
scriptName='scripts/release/tagging.sh', scriptName='scripts/release/tagging.sh',
extra_data={"tag_args": "--tag-source --tag-other"},
) )


builders.append({ builders.append({
'name': builderPrefix('%s_tag_source' % releaseConfig['productName']), 'name': builderPrefix('%s_tag' % releaseConfig['productName']),
'slavenames': pf['slaves'] + \ 'slavenames': pf['slaves'] + \
branchConfig['platforms']['linux64']['slaves'], branchConfig['platforms']['linux64']['slaves'],
'category': builderPrefix(''), 'category': builderPrefix(''),
'builddir': builderPrefix('%s_tag_source' % releaseConfig['productName']), 'builddir': builderPrefix('%s_tag' % releaseConfig['productName']),
'slavebuilddir': reallyShort( 'slavebuilddir': reallyShort(
builderPrefix('%s_tag_source' % releaseConfig['productName'])), builderPrefix('%s_tag' % releaseConfig['productName'])),
'factory': tag_source_factory, 'factory': tag_factory,
'nextSlave': _nextFastReservedSlave, 'nextSlave': _nextFastReservedSlave,
'env': tag_env, 'env': tag_env,
'properties': { 'properties': {
'builddir': builderPrefix( 'builddir': builderPrefix(
'%s_tag_source' % releaseConfig['productName']), '%s_tag' % releaseConfig['productName']),
'slavebuilddir': reallyShort( 'slavebuilddir': reallyShort(
builderPrefix('%s_tag_source' % releaseConfig['productName'])), builderPrefix('%s_tag' % releaseConfig['productName'])),
'release_config': releaseConfigFile, 'release_config': releaseConfigFile,
} }
}) })

if len(releaseConfig['l10nPlatforms']) > 0:
tag_l10n_factory = ScriptFactory(
scriptRepo=tools_repo,
scriptName='scripts/release/tagging.sh',
extra_data={"tag_args": "--tag-l10n"},
)

builders.append({
'name': builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
'slavenames': pf['slaves'] + \
branchConfig['platforms']['linux64']['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
'slavebuilddir': reallyShort(
builderPrefix('%s_tag_l10n' % releaseConfig['productName'])),
'factory': tag_l10n_factory,
'nextSlave': _nextFastReservedSlave,
'env': tag_env,
'properties': {
'builddir': builderPrefix(
'%s_tag_l10n' % releaseConfig['productName']),
'slavebuilddir': reallyShort(
builderPrefix('%s_tag_l10n' % releaseConfig['productName'])),
'release_config': releaseConfigFile,
}
})
else:
dummy_tag_builders.append("l10n")
else: else:
dummy_tag_builders.extend(["source","l10n"])
for dummy in dummy_tag_builders:
builders.append(makeDummyBuilder( builders.append(makeDummyBuilder(
name=builderPrefix('%s_tag_%s' % name=builderPrefix('%s_tag' % releaseConfig['productName']),
(releaseConfig['productName'], dummy)),
slaves=all_slaves, slaves=all_slaves,
category=builderPrefix(''), category=builderPrefix(''),
)) ))
Expand Down Expand Up @@ -572,6 +537,10 @@ def majorUpdateVerifyBuilders(platform):
platform_env = pf['env'].copy() platform_env = pf['env'].copy()
if 'update_channel' in branchConfig: if 'update_channel' in branchConfig:
platform_env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel'] platform_env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel']
if platform in releaseConfig['l10nPlatforms']:
triggeredSchedulers = [builderPrefix('%s_repack' % platform)]
else:
triggeredSchedulers = None
multiLocaleConfig = releaseConfig.get( multiLocaleConfig = releaseConfig.get(
'mozharness_config', {}).get('platforms', {}).get(platform) 'mozharness_config', {}).get('platforms', {}).get(platform)
mozharnessMultiOptions = releaseConfig.get( mozharnessMultiOptions = releaseConfig.get(
Expand Down Expand Up @@ -615,6 +584,7 @@ def majorUpdateVerifyBuilders(platform):
unittestBranch=unittestBranch, unittestBranch=unittestBranch,
clobberURL=branchConfig['base_clobber_url'], clobberURL=branchConfig['base_clobber_url'],
triggerBuilds=True, triggerBuilds=True,
triggeredSchedulers=triggeredSchedulers,
stagePlatform=buildbot2ftp(platform), stagePlatform=buildbot2ftp(platform),
use_scratchbox=pf.get('use_scratchbox'), use_scratchbox=pf.get('use_scratchbox'),
android_signing=pf.get('android_signing', False), android_signing=pf.get('android_signing', False),
Expand Down Expand Up @@ -1447,17 +1417,11 @@ def majorUpdateVerifyBuilders(platform):
'%s_repo_setup' % releaseConfig['productName'])], '%s_repo_setup' % releaseConfig['productName'])],
) )
schedulers.append(repo_setup_scheduler) schedulers.append(repo_setup_scheduler)
tag_source_scheduler = Dependent( tag_scheduler = Dependent(
name=builderPrefix('%s_tag_source' % releaseConfig['productName']), name=builderPrefix('%s_tag' % releaseConfig['productName']),
upstream=repo_setup_scheduler,
builderNames=[builderPrefix(
'%s_tag_source' % releaseConfig['productName'])],
)
tag_l10n_scheduler = Dependent(
name=builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
upstream=repo_setup_scheduler, upstream=repo_setup_scheduler,
builderNames=[builderPrefix( builderNames=[builderPrefix(
'%s_tag_l10n' % releaseConfig['productName'])], '%s_tag' % releaseConfig['productName'])],
) )
if not releaseConfig.get('skip_release_download'): if not releaseConfig.get('skip_release_download'):
release_downloader_scheduler = Scheduler( release_downloader_scheduler = Scheduler(
Expand All @@ -1472,47 +1436,34 @@ def majorUpdateVerifyBuilders(platform):
) )
schedulers.append(release_downloader_scheduler) schedulers.append(release_downloader_scheduler)
else: else:
tag_source_scheduler = Dependent( tag_scheduler = Dependent(
name=builderPrefix('%s_tag_source' % releaseConfig['productName']), name=builderPrefix('%s_tag' % releaseConfig['productName']),
upstream=reset_schedulers_scheduler,
builderNames=[builderPrefix(
'%s_tag_source' % releaseConfig['productName'])],
)
tag_l10n_scheduler = Dependent(
name=builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
upstream=reset_schedulers_scheduler, upstream=reset_schedulers_scheduler,
builderNames=[builderPrefix( builderNames=[builderPrefix(
'%s_tag_l10n' % releaseConfig['productName'])], '%s_tag' % releaseConfig['productName'])],
) )
schedulers.append(tag_source_scheduler) schedulers.append(tag_scheduler)
schedulers.append(tag_l10n_scheduler)


tag_source_downstream = [builderPrefix('%s_source' % releaseConfig['productName'])] tag_downstream = [builderPrefix('%s_source' % releaseConfig['productName'])]


if releaseConfig['buildNumber'] == 1 \ if releaseConfig['buildNumber'] == 1 \
and not releaseConfig.get('disableBouncerEntries'): and not releaseConfig.get('disableBouncerEntries'):
tag_source_downstream.append(builderPrefix('bouncer_submitter')) tag_downstream.append(builderPrefix('bouncer_submitter'))


if releaseConfig['doPartnerRepacks']: if releaseConfig['doPartnerRepacks']:
tag_source_downstream.append(builderPrefix('euballot_bouncer_submitter')) tag_downstream.append(builderPrefix('euballot_bouncer_submitter'))


if releaseConfig.get('xulrunnerPlatforms'): if releaseConfig.get('xulrunnerPlatforms'):
tag_source_downstream.append(builderPrefix('xulrunner_source')) tag_downstream.append(builderPrefix('xulrunner_source'))


for platform in releaseConfig['enUSPlatforms']: for platform in releaseConfig['enUSPlatforms']:
tag_source_downstream.append(builderPrefix('%s_build' % platform)) tag_downstream.append(builderPrefix('%s_build' % platform))
if platform in releaseConfig['notifyPlatforms']: if platform in releaseConfig['notifyPlatforms']:
important_builders.append(builderPrefix('%s_build' % platform)) important_builders.append(builderPrefix('%s_build' % platform))
if platform in releaseConfig['l10nPlatforms']: if platform in releaseConfig['l10nPlatforms']:
l10nBuilderNames = l10nBuilders(platform).values() l10nBuilderNames = l10nBuilders(platform).values()
repack_upstream = [ repack_scheduler = Triggerable(
builderPrefix('%s_build' % platform),
builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
]
repack_scheduler = AggregatingScheduler(
name=builderPrefix('%s_repack' % platform), name=builderPrefix('%s_repack' % platform),
branch=builderPrefix('%s_repack' % platform),
upstreamBuilders=repack_upstream,
builderNames=l10nBuilderNames, builderNames=l10nBuilderNames,
) )
schedulers.append(repack_scheduler) schedulers.append(repack_scheduler)
Expand All @@ -1525,15 +1476,15 @@ def majorUpdateVerifyBuilders(platform):
schedulers.append(repack_complete_scheduler) schedulers.append(repack_complete_scheduler)


for platform in releaseConfig.get('xulrunnerPlatforms', []): for platform in releaseConfig.get('xulrunnerPlatforms', []):
tag_source_downstream.append(builderPrefix('xulrunner_%s_build' % platform)) tag_downstream.append(builderPrefix('xulrunner_%s_build' % platform))


DependentID = makePropertiesScheduler(Dependent, [buildIDSchedFunc, buildUIDSchedFunc]) DependentID = makePropertiesScheduler(Dependent, [buildIDSchedFunc, buildUIDSchedFunc])


schedulers.append( schedulers.append(
DependentID( DependentID(
name=builderPrefix('%s_build' % releaseConfig['productName']), name=builderPrefix('%s_build' % releaseConfig['productName']),
upstream=tag_source_scheduler, upstream=tag_scheduler,
builderNames=tag_source_downstream, builderNames=tag_downstream,
)) ))


if releaseConfig.get('majorUpdateRepoPath'): if releaseConfig.get('majorUpdateRepoPath'):
Expand Down

0 comments on commit f92a5a4

Please sign in to comment.