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

Commit

Permalink
Bug 1019724 - Update channels for single locale Beta and Release buil…
Browse files Browse the repository at this point in the history 
…ds of Firefox for Android 30 (and beyond) r=rail
  • Loading branch information
@kmoir
kmoir committed Nov 5, 2014
1 parent 39ebdd6 commit 42945ed
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions process/release.py
View file
Expand Up @@ -1199,32 +1199,32 @@ def getMessageId():
)

builders.append({
'name': builderPrefix('updates_%s' % releaseConfig['productName']),
'name': builderPrefix('%s_updates' % releaseConfig['productName']),
'slavenames': branchConfig['platforms']['linux']['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('updates_%s' % releaseConfig['productName']),
'slavebuilddir': normalizeName(builderPrefix('updates_%s' % releaseConfig['productName']), releaseConfig['productName']),
'builddir': builderPrefix('%s_updates' % releaseConfig['productName']),
'slavebuilddir': normalizeName(builderPrefix('%s_updates' % releaseConfig['productName']), releaseConfig['productName']),
'factory': updates_factory,
'nextSlave': _nextSlave_skip_spot,
'env': builder_env,
'properties': {
'slavebuilddir': normalizeName(builderPrefix('updates_%s' % releaseConfig['productName']), releaseConfig['productName']),
'slavebuilddir': normalizeName(builderPrefix('%s_updates' % releaseConfig['productName']), releaseConfig['productName']),
'platform': platform,
'branch': 'release-%s' % sourceRepoInfo['name'],
'release_config': releaseConfigFile,
'script_repo_revision': releaseTag,
'event_group': 'update',
}
})
post_signing_builders.append(builderPrefix('updates_%s' % releaseConfig['productName']))
post_signing_builders.append(builderPrefix('%s_updates' % releaseConfig['productName']))

# Releases that aren't automatically pushed to mirrors have their
# updates tested on an internal channel first. For these, we need to
# send out mail to let people know that it's ready to test.
if not releaseConfig.get('enableAutomaticPushToMirrors'):
important_builders.append(builderPrefix('updates_%s' % releaseConfig['productName']))
important_builders.append(builderPrefix('%s_updates' % releaseConfig['productName']))
if not releaseConfig.get('enablePartialMarsAtBuildTime', True):
deliverables_builders.append(builderPrefix('updates_%s' % releaseConfig['productName']))
deliverables_builders.append(builderPrefix('%s_updates' % releaseConfig['productName']))

update_shipping_factory_args = dict(
scriptRepo=tools_repo,
Expand Down Expand Up @@ -1264,7 +1264,7 @@ def getMessageId():
elif releaseConfig.get('verifyConfigs') or \
hasPlatformSubstring(releaseConfig['enUSPlatforms'], 'android'):
builders.append(makeDummyBuilder(
name=builderPrefix('updates_%s' % releaseConfig['productName']),
name=builderPrefix('%s_updates' % releaseConfig['productName']),
slaves=all_slaves,
category=builderPrefix(''),
properties={
Expand All @@ -1273,7 +1273,7 @@ def getMessageId():
'event_group': 'update',
},
))
post_signing_builders.append(builderPrefix('updates_%s' % releaseConfig['productName']))
post_signing_builders.append(builderPrefix('%s_updates' % releaseConfig['productName']))

for platform in sorted(releaseConfig.get('verifyConfigs', {}).keys()):
vpf = branchConfig['platforms'][platform]
Expand Down Expand Up @@ -1503,7 +1503,7 @@ def getMessageId():

if not releaseConfig.get('disableBouncerEntries'):
trigger_uptake_factory = BuildFactory()
schedulerNames = [builderPrefix('almost-ready-for-release_%s' % releaseConfig['productName'])]
schedulerNames = [builderPrefix('%s_almost-ready-for-release' % releaseConfig['productName'])]
if releaseConfig.get('verifyConfigs'):
schedulerNames.append(builderPrefix('ready-for-rel-test'))
trigger_uptake_factory.addStep(Trigger(
Expand All @@ -1514,10 +1514,10 @@ def getMessageId():
},
))
builders.append({
'name': builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName']),
'name': builderPrefix('%s_start_uptake_monitoring' % releaseConfig['productName']),
'slavenames': all_slaves,
'category': builderPrefix(''),
'builddir': builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName']),
'builddir': builderPrefix('%s_start_uptake_monitoring' % releaseConfig['productName']),
'slavebuilddir': normalizeName(builderPrefix('st_uptake'), releaseConfig['productName']),
'factory': trigger_uptake_factory,
'env': builder_env,
Expand Down Expand Up @@ -1559,7 +1559,7 @@ def getMessageId():

if not releaseConfig.get('disableBouncerEntries'):
builders.append(makeDummyBuilder(
name=builderPrefix('ready_for_releasetest_testing_%s' % releaseConfig['productName']),
name=builderPrefix('%s_ready_for_releasetest_testing' % releaseConfig['productName']),
slaves=all_slaves,
category=builderPrefix(''),
properties={
Expand All @@ -1569,10 +1569,10 @@ def getMessageId():
},
))
important_builders.append(
builderPrefix('ready_for_releasetest_testing_%s' % releaseConfig['productName']))
builderPrefix('%s_ready_for_releasetest_testing' % releaseConfig['productName']))

builders.append(makeDummyBuilder(
name=builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName']),
name=builderPrefix('%s_almost_ready_for_release' % releaseConfig['productName']),
slaves=all_slaves,
category=builderPrefix(''),
properties={
Expand All @@ -1582,7 +1582,7 @@ def getMessageId():
))

builders.append(makeDummyBuilder(
name=builderPrefix('ready_for_release_%s' % releaseConfig['productName']),
name=builderPrefix('%s_ready_for_release' % releaseConfig['productName']),
slaves=all_slaves,
category=builderPrefix(''),
properties={
Expand All @@ -1591,7 +1591,7 @@ def getMessageId():
'event_group': 'release',
},
))
important_builders.append(builderPrefix('ready_for_release_%s' % releaseConfig['productName']))
important_builders.append(builderPrefix('%s_ready_for_release' % releaseConfig['productName']))

if not releaseConfig.get('disableBouncerEntries'):
extra_args = ["-c", releaseConfig["bouncer_submitter_config"],
Expand All @@ -1612,11 +1612,11 @@ def getMessageId():
)

builders.append({
'name': builderPrefix('bouncer_submitter_%s' % releaseConfig['productName'] ),
'name': builderPrefix('%s_bouncer_submitter' % releaseConfig['productName'] ),
'slavenames': branchConfig['platforms']['linux']['slaves'] +
branchConfig['platforms']['linux64']['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('bouncer_submitter_%s' % releaseConfig['productName']),
'builddir': builderPrefix('%s_bouncer_submitter' % releaseConfig['productName']),
'slavebuilddir': normalizeName(builderPrefix('bncr_sub'), releaseConfig['productName']),
'factory': bouncer_submitter_factory,
'env': builder_env,
Expand Down Expand Up @@ -1671,7 +1671,7 @@ def getMessageId():

if releaseConfig['buildNumber'] == 1 \
and not releaseConfig.get('disableBouncerEntries'):
tag_downstream.append(builderPrefix('bouncer_submitter_%s' % releaseConfig['productName']))
tag_downstream.append(builderPrefix('%s_bouncer_submitter' % releaseConfig['productName']))

if releaseConfig.get('xulrunnerPlatforms'):
tag_downstream.append(builderPrefix('xulrunner_source'))
Expand Down Expand Up @@ -1732,7 +1732,7 @@ def getMessageId():
schedulers.append(s)

if not releaseConfig.get('disableBouncerEntries'):
readyForReleaseUpstreams = [builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName'])]
readyForReleaseUpstreams = [builderPrefix('%s_almost_ready_for_release' % releaseConfig['productName'])]
if releaseConfig.get('verifyConfigs'):
readyForReleaseUpstreams += post_update_builders
finalVerifyBuilders = []
Expand All @@ -1745,7 +1745,7 @@ def getMessageId():
configRepo=config_repo,
minUptake=releaseConfig.get('releasetestUptake', 10000),
builderNames=[builderPrefix(
'ready_for_releasetest_testing_%s' % releaseConfig['productName'])] + finalVerifyBuilders,
'%s_ready_for_releasetest_testing' % releaseConfig['productName'])] + finalVerifyBuilders,
username=BuildSlaves.tuxedoUsername,
password=BuildSlaves.tuxedoPassword)

Expand All @@ -1758,11 +1758,11 @@ def getMessageId():
# "ready for release" scheduler to be downstream of both it and the
# update verify builders to get the behaviour we need.
schedulers.append(TriggerBouncerCheck(
name=builderPrefix('almost-ready-for-release_%s' % releaseConfig['productName']),
name=builderPrefix('%s_almost-ready-for-release' % releaseConfig['productName']),
configRepo=config_repo,
minUptake=releaseConfig.get('releaseUptake', 10000),
checkMARs=not releaseConfig.get('skip_updates', False),
builderNames=[builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName'])],
builderNames=[builderPrefix('%s_almost_ready_for_release' % releaseConfig['productName'])],
username=BuildSlaves.tuxedoUsername,
password=BuildSlaves.tuxedoPassword
))
Expand All @@ -1771,7 +1771,7 @@ def getMessageId():
name=builderPrefix('ready-for-release_%s' % releaseConfig['productName']),
branch=sourceRepoInfo['path'],
upstreamBuilders=readyForReleaseUpstreams,
builderNames=[builderPrefix('ready_for_release_%s' % releaseConfig['productName'])],
builderNames=[builderPrefix('%s_ready_for_release' % releaseConfig['productName'])],
))

if releaseConfig.get('enableAutomaticPushToMirrors') and \
Expand All @@ -1796,7 +1796,7 @@ def getMessageId():
schedulers.append(AggregatingScheduler(
name=builderPrefix('updates_done'),
branch=sourceRepoInfo['path'],
upstreamBuilders=[builderPrefix('updates_%s' % releaseConfig['productName'])],
upstreamBuilders=[builderPrefix('%s_updates' % releaseConfig['productName'])],
builderNames=post_update_builders,
))
if post_deliverables_builders:
Expand Down Expand Up @@ -1843,14 +1843,14 @@ def getMessageId():
))
upstream_builders = [builderPrefix('%s_push_to_mirrors' % releaseConfig['productName'])]
if releaseConfig.get('verifyConfigs'):
upstream_builders.append(builderPrefix('updates_%s' % releaseConfig['productName']))
upstream_builders.append(builderPrefix('%s_updates' % releaseConfig['productName']))
if not releaseConfig.get('disableBouncerEntries'):
schedulers.append(AggregatingScheduler(
name=builderPrefix(
'%s_uptake_check' % releaseConfig['productName']),
branch=sourceRepoInfo['path'],
upstreamBuilders=upstream_builders,
builderNames=[builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName'])]
builderNames=[builderPrefix('%s_start_uptake_monitoring' % releaseConfig['productName'])]
))

# This builder should be come after all AggregatingSchedulers are set
Expand Down Expand Up @@ -1958,7 +1958,7 @@ def getMessageId():
extraHeaders={'In-Reply-To': email_message_id,
'References': email_message_id},
mode='passing',
builders=[builderPrefix('updates_%s' % releaseConfig['productName'])],
builders=[builderPrefix('%s_updates' % releaseConfig['productName'])],
relayhost='mail.build.mozilla.org',
messageFormatter=createReleaseAVVendorsMessage,
))
Expand Down

0 comments on commit 42945ed

Please sign in to comment.