Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bug 607392 - split tagging into en-US and other. Backed out revisions…

… 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...
commit f92a5a44ab58cc50acc1de6b0dc53313372f4ab7 1 parent a6d00de
@rail rail authored
Showing with 29 additions and 78 deletions.
  1. +29 −78 process/release.py
View
107 process/release.py
@@ -383,74 +383,39 @@ def majorUpdateVerifyBuilders(platform):
}
})
- dummy_tag_builders=[]
if not releaseConfig.get('skip_tag'):
pf = branchConfig['platforms']['linux']
tag_env = builder_env.copy()
if pf['env'].get('HG_SHARE_BASE_DIR', None):
tag_env['HG_SHARE_BASE_DIR'] = pf['env']['HG_SHARE_BASE_DIR']
- # Other includes mozharness, required for Mobile Builds
- tag_source_factory = ScriptFactory(
+ tag_factory = ScriptFactory(
scriptRepo=tools_repo,
scriptName='scripts/release/tagging.sh',
- extra_data={"tag_args": "--tag-source --tag-other"},
)
builders.append({
- 'name': builderPrefix('%s_tag_source' % releaseConfig['productName']),
+ 'name': builderPrefix('%s_tag' % releaseConfig['productName']),
'slavenames': pf['slaves'] + \
branchConfig['platforms']['linux64']['slaves'],
'category': builderPrefix(''),
- 'builddir': builderPrefix('%s_tag_source' % releaseConfig['productName']),
+ 'builddir': builderPrefix('%s_tag' % releaseConfig['productName']),
'slavebuilddir': reallyShort(
- builderPrefix('%s_tag_source' % releaseConfig['productName'])),
- 'factory': tag_source_factory,
+ builderPrefix('%s_tag' % releaseConfig['productName'])),
+ 'factory': tag_factory,
'nextSlave': _nextFastReservedSlave,
'env': tag_env,
'properties': {
'builddir': builderPrefix(
- '%s_tag_source' % releaseConfig['productName']),
+ '%s_tag' % releaseConfig['productName']),
'slavebuilddir': reallyShort(
- builderPrefix('%s_tag_source' % releaseConfig['productName'])),
+ builderPrefix('%s_tag' % releaseConfig['productName'])),
'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:
- dummy_tag_builders.extend(["source","l10n"])
- for dummy in dummy_tag_builders:
builders.append(makeDummyBuilder(
- name=builderPrefix('%s_tag_%s' %
- (releaseConfig['productName'], dummy)),
+ name=builderPrefix('%s_tag' % releaseConfig['productName']),
slaves=all_slaves,
category=builderPrefix(''),
))
@@ -572,6 +537,10 @@ def majorUpdateVerifyBuilders(platform):
platform_env = pf['env'].copy()
if 'update_channel' in branchConfig:
platform_env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel']
+ if platform in releaseConfig['l10nPlatforms']:
+ triggeredSchedulers = [builderPrefix('%s_repack' % platform)]
+ else:
+ triggeredSchedulers = None
multiLocaleConfig = releaseConfig.get(
'mozharness_config', {}).get('platforms', {}).get(platform)
mozharnessMultiOptions = releaseConfig.get(
@@ -615,6 +584,7 @@ def majorUpdateVerifyBuilders(platform):
unittestBranch=unittestBranch,
clobberURL=branchConfig['base_clobber_url'],
triggerBuilds=True,
+ triggeredSchedulers=triggeredSchedulers,
stagePlatform=buildbot2ftp(platform),
use_scratchbox=pf.get('use_scratchbox'),
android_signing=pf.get('android_signing', False),
@@ -1447,17 +1417,11 @@ def majorUpdateVerifyBuilders(platform):
'%s_repo_setup' % releaseConfig['productName'])],
)
schedulers.append(repo_setup_scheduler)
- tag_source_scheduler = Dependent(
- name=builderPrefix('%s_tag_source' % releaseConfig['productName']),
- upstream=repo_setup_scheduler,
- builderNames=[builderPrefix(
- '%s_tag_source' % releaseConfig['productName'])],
- )
- tag_l10n_scheduler = Dependent(
- name=builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
+ tag_scheduler = Dependent(
+ name=builderPrefix('%s_tag' % releaseConfig['productName']),
upstream=repo_setup_scheduler,
builderNames=[builderPrefix(
- '%s_tag_l10n' % releaseConfig['productName'])],
+ '%s_tag' % releaseConfig['productName'])],
)
if not releaseConfig.get('skip_release_download'):
release_downloader_scheduler = Scheduler(
@@ -1472,47 +1436,34 @@ def majorUpdateVerifyBuilders(platform):
)
schedulers.append(release_downloader_scheduler)
else:
- tag_source_scheduler = Dependent(
- name=builderPrefix('%s_tag_source' % releaseConfig['productName']),
- upstream=reset_schedulers_scheduler,
- builderNames=[builderPrefix(
- '%s_tag_source' % releaseConfig['productName'])],
- )
- tag_l10n_scheduler = Dependent(
- name=builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
+ tag_scheduler = Dependent(
+ name=builderPrefix('%s_tag' % releaseConfig['productName']),
upstream=reset_schedulers_scheduler,
builderNames=[builderPrefix(
- '%s_tag_l10n' % releaseConfig['productName'])],
+ '%s_tag' % releaseConfig['productName'])],
)
- schedulers.append(tag_source_scheduler)
- schedulers.append(tag_l10n_scheduler)
+ schedulers.append(tag_scheduler)
- tag_source_downstream = [builderPrefix('%s_source' % releaseConfig['productName'])]
+ tag_downstream = [builderPrefix('%s_source' % releaseConfig['productName'])]
if releaseConfig['buildNumber'] == 1 \
and not releaseConfig.get('disableBouncerEntries'):
- tag_source_downstream.append(builderPrefix('bouncer_submitter'))
+ tag_downstream.append(builderPrefix('bouncer_submitter'))
if releaseConfig['doPartnerRepacks']:
- tag_source_downstream.append(builderPrefix('euballot_bouncer_submitter'))
+ tag_downstream.append(builderPrefix('euballot_bouncer_submitter'))
if releaseConfig.get('xulrunnerPlatforms'):
- tag_source_downstream.append(builderPrefix('xulrunner_source'))
+ tag_downstream.append(builderPrefix('xulrunner_source'))
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']:
important_builders.append(builderPrefix('%s_build' % platform))
if platform in releaseConfig['l10nPlatforms']:
l10nBuilderNames = l10nBuilders(platform).values()
- repack_upstream = [
- builderPrefix('%s_build' % platform),
- builderPrefix('%s_tag_l10n' % releaseConfig['productName']),
- ]
- repack_scheduler = AggregatingScheduler(
+ repack_scheduler = Triggerable(
name=builderPrefix('%s_repack' % platform),
- branch=builderPrefix('%s_repack' % platform),
- upstreamBuilders=repack_upstream,
builderNames=l10nBuilderNames,
)
schedulers.append(repack_scheduler)
@@ -1525,15 +1476,15 @@ def majorUpdateVerifyBuilders(platform):
schedulers.append(repack_complete_scheduler)
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])
schedulers.append(
DependentID(
name=builderPrefix('%s_build' % releaseConfig['productName']),
- upstream=tag_source_scheduler,
- builderNames=tag_source_downstream,
+ upstream=tag_scheduler,
+ builderNames=tag_downstream,
))
if releaseConfig.get('majorUpdateRepoPath'):
Please sign in to comment.
Something went wrong with that request. Please try again.