Bug 1346899 - tweak bbconfigs to take into account Fennec BB builders. r=rail
MozReview-Commit-ID: 2a06EZKv2uC
--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -101,17 +101,18 @@ c['status'].extend(buildObjects['status'
for s in buildObjects['schedulers']:
if isinstance(s, Triggerable):
c['schedulers'].append(s)
if ENABLE_RELEASES:
import buildbotcustom.process.release
reload(buildbotcustom.process.release)
from buildbotcustom.process.release import generateReleaseBranchObjects
- from buildbotcustom.process.release import generateReleasePromotionBuilders
+ from buildbotcustom.process.release import (generateReleasePromotionBuilders,
+ generateFennecReleasePromotionBuilders)
# TODO remove this block when we have completely switched to release promotion
# Bug 1215865 - remove generateReleaseBranchObjects after fully porting to release promotion
for product, sourceRepoKey, productBranches, releaseBranch in \
[('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
[('fennec', 'mobile', BRANCHES, b)
for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
@@ -153,16 +154,22 @@ if ENABLE_RELEASES:
if BRANCHES[branch].get('enable_release_promotion'):
# Only Firefox is supported for now
for product in ("firefox",):
c['builders'].extend(generateReleasePromotionBuilders(
branch_config=BRANCHES[branch], branch_name=branch,
product=product,
secrets=getattr(passwords, 'secrets', None)
))
+ for product in ("fennec",):
+ c['builders'].extend(generateFennecReleasePromotionBuilders(
+ branch_config=BRANCHES[branch], branch_name=branch,
+ product=product,
+ secrets=getattr(passwords, 'secrets', None)
+ ))
from passwords import BBDB_URL
c['db_url'] = BBDB_URL
c['db_poll_interval'] = 60
c['multiMaster'] = True
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -98,17 +98,18 @@ c['builders'].extend(buildObjects['build
c['status'].extend(buildObjects['status'])
c['change_source'].extend(buildObjects['change_source'])
c['schedulers'].extend(buildObjects['schedulers'])
if ENABLE_RELEASES:
import buildbotcustom.process.release
reload(buildbotcustom.process.release)
from buildbotcustom.process.release import generateReleaseBranchObjects
- from buildbotcustom.process.release import generateReleasePromotionBuilders
+ from buildbotcustom.process.release import (generateReleasePromotionBuilders,
+ generateFennecReleasePromotionBuilders)
# TODO remove this block when we have completely switched to release promotion
# Bug 1215865 - remove generateReleaseBranchObjects after fully porting to release promotion
for product, sourceRepoKey, productBranches, releaseBranch in \
[('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
[('fennec', 'mobile', BRANCHES, b)
for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
@@ -141,16 +142,22 @@ if ENABLE_RELEASES:
if BRANCHES[branch].get('enable_release_promotion'):
# Only Firefox is supported for now
for product in ("firefox",):
c['builders'].extend(generateReleasePromotionBuilders(
branch_config=BRANCHES[branch], branch_name=branch,
product=product,
secrets=getattr(passwords, 'secrets', None)
))
+ for product in ("fennec",):
+ c['builders'].extend(generateFennecReleasePromotionBuilders(
+ branch_config=BRANCHES[branch], branch_name=branch,
+ product=product,
+ secrets=getattr(passwords, 'secrets', None)
+ ))
c['db_url'] = "sqlite:///state.sqlite"
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
if hasattr(passwords, 'PULSE_PASSWORD'):
pulseQueue = QueueDir('pulse', '%s/pulse' % master_localconfig.QUEUEDIR)
# Send pulse messages