Bug 1249528 - backout, r=me
authorRail Aliiev <rail@mozilla.com>
Tue, 15 Mar 2016 09:25:23 -0400
changeset 13964 fc1e57afc013d4a70d26d68172dcb893880e6a22
parent 13963 806fd2074e587c21b8ce3c5d3c65f3b158397ffa
child 13965 00507a93eac38016bf1c8f8d7ee2685a42de6ebf
child 13968 216ac6505867073a78638ed36181cb5a26f76bd4
push id9817
push userraliiev@mozilla.com
push dateTue, 15 Mar 2016 13:26:39 +0000
reviewersme
bugs1249528
Bug 1249528 - backout, r=me
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2642,21 +2642,16 @@ BRANCHES['mozilla-release']['enable_bloc
 BRANCHES['mozilla-release']['enable_valgrind'] = False
 BRANCHES['mozilla-release']['enabled_products'] = ['firefox', 'mobile']
 BRANCHES['mozilla-release']['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86'
 BRANCHES['mozilla-release']['platforms']['android-api-9']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-9'
 # TODO - remove android-api-11 line when gecko 46 reaches m-r
 BRANCHES['mozilla-release']['platforms']['android-api-11']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-11'
 BRANCHES['mozilla-release']['platforms']['android-api-15']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-api-15'
 BRANCHES['mozilla-release']['platforms']['macosx64']['platform_objdir'] = "%s/x86_64" % OBJDIR
-# Release promotion related
-BRANCHES['mozilla-release']['release_channel_mappings'] = [
-    [r"^\d+\.0$", ["beta", "release"]],  # RC, 45.0
-    [r"^\d+\.\d+\.\d+$", ["release"]],  # Other (dot releaseas), 45.0.4
-]
 
 ######## mozilla-beta
 BRANCHES['mozilla-beta']['repo_path'] = 'releases/mozilla-beta'
 BRANCHES['mozilla-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['mozilla-beta']['update_channel'] = 'beta'
 BRANCHES['mozilla-beta']['start_hour'] = [3]
 BRANCHES['mozilla-beta']['start_minute'] = [2]
 # Enable PGO Builds on this branch
@@ -2717,17 +2712,17 @@ BRANCHES['mozilla-beta']['platforms']['l
 BRANCHES['mozilla-beta']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-beta']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
 BRANCHES['mozilla-beta']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
 # 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'] = False
-BRANCHES['mozilla-beta']['release_channel_mappings'] = [["^.*$", ["beta"]]]
+BRANCHES['mozilla-beta']['release_channels'] = ("beta",)
 BRANCHES['mozilla-beta']['beetmover_buckets'] = {
     "firefox": "net-mozaws-prod-delivery-firefox",
     # TODO - add fennec support
     # 'fennec': 'net-mozaws-prod-delivery-archive',
 }
 BRANCHES['mozilla-beta']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
 BRANCHES['mozilla-beta']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
 ###
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -145,17 +145,17 @@ PROJECT_BRANCHES = {
         'enable_valgrind': False,
         'pgo_strategy': 'per-checkin',
         'enable_release_promotion': True,
         'build_tools_repo_path': 'users/raliiev_mozilla.com/tools',
         'partners_repo_path': 'build/partner-repacks',
         'partner_repack_platforms': ('linux', 'linux64', 'win32', 'win64', 'macosx64'),
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
-        "release_channel_mappings": [["^.*$", ["date"]]],
+        "release_channels": ("date", ),
         # temp balrog
         'balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
         'funsize_balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': "releases/bouncer_firefox_date.py",
         'bouncer_branch': "releases/date",
         'bouncer_enabled': True,
         'postrelease_version_bump_enabled': True,