Bug 1309894 - Investigate shipping old release version off of jamun r=Callek
authorRail Aliiev <rail@mozilla.com>
Thu, 13 Oct 2016 10:48:06 -0400 (2016-10-13)
changeset 14601 6f25921852c31bee7f20101c2692f890b871aa4d
parent 14600 a9bbcd872ad9aa70ca952d3571142aad6a5dc26e
child 14602 5f01a35d3ca45e9a7d5e15acc5c8819c1d457d1e
child 14603 b4018e35492b88902acc97a76287aef071e3b8b0
push id10236
push userraliiev@mozilla.com
push dateThu, 13 Oct 2016 16:27:57 +0000 (2016-10-13)
reviewersCallek
bugs1309894
Bug 1309894 - Investigate shipping old release version off of jamun r=Callek MozReview-Commit-ID: Ldc80WwuiZb
mozilla/project_branches.py
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -122,16 +122,17 @@ PROJECT_BRANCHES = {
     },
     # Disabled by Bug 1135702
     # 'fig': {},
     # Disabled by Bug 1206269
     # 'gum': {},
     # disabled in bug 1215527
     # 'holly': {},
     'jamun': {
+        'gecko_version': 47,
         'desktop_mozharness_builds_enabled': True,
         'use_mozharness_repo_cache': False,
         'branch_projects': [],
         ## TODO - enabled tests.
         # note - to enable tests you must also remove:
         # platforms[platform]["slave_platforms"] item override below
         'enable_opt_unittests': False,
         'enable_debug_unittests': False,
@@ -183,46 +184,49 @@ PROJECT_BRANCHES = {
             },
         },
         'pgo_strategy': 'per-checkin',
         'enable_release_promotion': True,
         'build_tools_repo_path': 'users/raliiev_mozilla.com/tools',
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "single_locale_branch_config": "dev-mozilla-release",
-        "release_channel_mappings": [["^.*$", ["esr"]]],
+        'release_channel_mappings': [
+            [r"^\d+\.0$", ["beta", "release"]],  # RC, 45.0
+            [r"^\d+\.\d+\.\d+$", ["release"]],  # Other (dot releaseas), 45.0.4
+        ],
         # temp balrog
         'balrog_api_root': 'https://balrog-admin.stage.mozaws.net/api',
         'funsize_balrog_api_root': 'https://balrog-admin.stage.mozaws.net/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': {
-            "firefox": "releases/bouncer_firefox_esr.py",
+            "firefox": "releases/bouncer_firefox_release.py",
         },
         'bouncer_enabled': True,
         'updates_builder_enabled': True,
         'update_verify_enabled': True,
         'postrelease_version_bump_enabled': True,
         'postrelease_version_bump_config': {
-            "firefox": 'releases/dev_postrelease_firefox_esr45.py',
+            "firefox": 'releases/dev_postrelease_firefox_release.py',
         },
         'uptake_monitoring_enabled': True,
         'uptake_monitoring_config': {
-            "firefox": 'releases/dev_bouncer_firefox_esr.py',
+            "firefox": 'releases/bouncer_firefox_release.py',
         },
         'postrelease_bouncer_aliases_enabled': True,
         'postrelease_bouncer_aliases_config': {
-            "firefox": 'releases/dev_bouncer_firefox_esr.py',
+            "firefox": 'releases/bouncer_firefox_release.py',
         },
         'postrelease_mark_as_shipped_enabled': True,
         'postrelease_mark_as_shipped_config': {
-            "firefox": 'releases/dev_postrelease_firefox_esr45.py',
+            "firefox": 'releases/dev_postrelease_firefox_release.py',
         },
         'push_to_candidates_enabled': True,
         'updates_config': {
-            "firefox": 'releases/dev_updates_firefox_esr45.py',
+            "firefox": 'releases/dev_updates_firefox_release.py',
         },
         'beetmover_credentials': '/builds/dev-beetmover-s3.credentials',
         'beetmover_buckets': {
             'firefox': 'net-mozaws-stage-delivery-firefox',
         },
         'stage_product': {
             'firefox': 'firefox',
             'fennec': 'mobile',