Bug 1251477 - prep buildbot configs for release promotion in production on beta, r?rail
2-for-1! no buildername conflicts and prepped for production beta.
builderlist diff: http://people.mozilla.org/~jlund/beta_production-builderlist.diff
print config.py: http://people.mozilla.org/~jlund/beta_production-config_py.diff
MozReview-Commit-ID: DlhU0bXtJpL
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2612,16 +2612,41 @@ BRANCHES['mozilla-beta']['platforms']['a
BRANCHES['mozilla-beta']['platforms']['android-api-15']['enable_dep'] = True
BRANCHES['mozilla-beta']['platforms']['android-api-9-debug']['enable_dep'] = True
# TODO - remove android-api-11 line when gecko 46 reaches m-b
BRANCHES['mozilla-beta']['platforms']['android-api-11-debug']['enable_dep'] = True
BRANCHES['mozilla-beta']['platforms']['android-api-15-debug']['enable_dep'] = True
BRANCHES['mozilla-beta']['platforms']['macosx64']['platform_objdir'] = "%s/x86_64" % OBJDIR
BRANCHES['mozilla-beta']['enabled_products'] = ['firefox', 'mobile']
BRANCHES['mozilla-beta']['enable_perproduct_builds'] = True
+### Release Promotion
+BRANCHES['mozilla-beta']['enable_release_promotion'] = True
+# used by process/release.py
+BRANCHES['mozilla-beta']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-beta']['bouncer_submitter_config'] = "releases/bouncer_firefox_beta.py"
+BRANCHES['mozilla-beta']['bouncer_branch'] = "releases/mozilla-beta"
+BRANCHES['mozilla-beta']['postrelease_version_bump_config'] = "releases/postrelease_beta.py"
+BRANCHES['mozilla-beta']['updates_config'] = "releases/updates_date.py"
+BRANCHES['mozilla-beta']['update_verify_chunks'] = 6
+BRANCHES['mozilla-beta']['beetmover_credentials'] = "/builds/release-s3.credentials"
+BRANCHES['mozilla-beta']['stage_product'] = {
+ 'firefox': 'firefox',
+ 'fennec': 'mobile'
+}
+# used by releasetasks
+BRANCHES['mozilla-beta']['bouncer_enabled'] = True,
+BRANCHES['mozilla-beta']['postrelease_version_bump_enabled'] = True,
+BRANCHES['mozilla-beta']['push_to_candidates_enabled'] = True,
+BRANCHES['mozilla-beta']['push_to_releases_automatic'] = True,
+BRANCHES['mozilla-beta']['release_channels'] = ("beta",)
+# TODO - change beetmover_candidates_bucket to support multiple buckets as fennec will need its own
+BRANCHES['mozilla-beta']['beetmover_candidates_bucket'] = "net-mozaws-prod-delivery-firefox"
+BRANCHES['mozilla-beta']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
+BRANCHES['mozilla-beta']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
+###
######## mozilla-aurora
BRANCHES['mozilla-aurora']['repo_path'] = 'releases/mozilla-aurora'
BRANCHES['mozilla-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
BRANCHES['mozilla-aurora']['enable_perproduct_builds'] = True
BRANCHES['mozilla-aurora']['start_hour'] = [0]
BRANCHES['mozilla-aurora']['start_minute'] = [40]
BRANCHES['mozilla-aurora']['periodic_start_hours'] = range(1, 24, 6)
@@ -2964,18 +2989,19 @@ for branch in ("mozilla-aurora", "mozill
# B2G's INBOUND
for b in ('b2g-inbound',):
for p in BRANCHES[b]['platforms'].keys():
if 'linux' not in p:
BRANCHES[b]['platforms'][p]['enable_checktests'] = False
# END B2G's INBOUND
ma_gecko_version = BRANCHES['mozilla-aurora']['gecko_version']
-# enable mozharness desktop builds on m-a, m-c, and m-c related branches
-for name, branch in items_at_least(BRANCHES, 'gecko_version', ma_gecko_version):
+mb_gecko_version = BRANCHES['mozilla-beta']['gecko_version']
+# enable mozharness desktop builds on m-b, m-a, m-c, and m-c related branches
+for name, branch in items_at_least(BRANCHES, 'gecko_version', mb_gecko_version):
# if true, any platform with mozharness_desktop_build in its config
# will use mozharness instead of MozillaBuildFactory
branch['desktop_mozharness_builds_enabled'] = True
# enable mozharness mobile builds on m-a, m-c, and m-c related branches
for name, branch in items_before(BRANCHES, 'gecko_version', ma_gecko_version):
for platform in branch['platforms'].keys():
if 'android' in platform: