Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbot-cfgs, r?rail draft
authorJordan Lund <jlund@mozilla.com>
Wed, 17 May 2017 17:28:31 -0700
changeset 14726 44d29517ffa99d89e61ae01f7514357acc4bd44b
parent 14725 04fefd582166cdad9c418fa8024fa00cf2df48af
push id154
push userbmo:jlund@mozilla.com
push dateThu, 18 May 2017 00:28:37 +0000
reviewersrail
bugs1365588
Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbot-cfgs, r?rail MozReview-Commit-ID: 3M2B3vN5AyR
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2234,16 +2234,19 @@ BRANCHES['mozilla-release']['enable_bloc
 BRANCHES['mozilla-release']['enabled_products'] = ['firefox', 'mobile']
 ### Release Promotion
 BRANCHES['mozilla-release']['enable_release_promotion'] = {
     "firefox": True,
     "fennec": True,
 }
 # used by process/release.py
 BRANCHES['mozilla-release']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-release']['single_locale_branch_config'] = {
+    "firefox": "mozilla-release",
+}
 BRANCHES['mozilla-release']['bouncer_submitter_config'] = {
     "firefox": "releases/bouncer_firefox_release.py",
     "fennec": 'releases/bouncer_fennec.py',
 }
 BRANCHES['mozilla-release']['uptake_monitoring_config'] = {
     "firefox": 'releases/bouncer_firefox_release.py',
     "fennec": 'releases/bouncer_fennec.py',
 }
@@ -2405,16 +2408,20 @@ BRANCHES['mozilla-beta']['enable_perprod
 # enables/disables BB builders
 BRANCHES['mozilla-beta']['enable_release_promotion'] = {
     "firefox": True,
     "fennec": True,
     "devedition": True,
 }
 # used by process/release.py
 BRANCHES['mozilla-beta']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-beta']['single_locale_branch_config'] = {
+    "firefox": "mozilla-beta",
+    "devedition": "mozilla-beta_devedition",
+}
 BRANCHES['mozilla-beta']['bouncer_submitter_config'] = {
     "firefox": "releases/bouncer_firefox_beta.py",
     "devedition": "releases/bouncer_firefox_devedition.py",
     "fennec": 'releases/bouncer_fennec_beta.py',
 }
 BRANCHES['mozilla-beta']['uptake_monitoring_config'] = {
     "firefox": 'releases/bouncer_firefox_beta.py',
     "devedition": "releases/bouncer_firefox_devedition.py",
@@ -2659,16 +2666,19 @@ BRANCHES['mozilla-esr45']['enable_hsts_u
 BRANCHES['mozilla-esr45']['enable_hpkp_update'] = True
 BRANCHES['mozilla-esr45']['enabled_products'] = ['firefox']
 ### Release Promotion
 BRANCHES['mozilla-esr45']['enable_release_promotion'] = {
     "firefox": True,
 }
 # used by process/release.py
 BRANCHES['mozilla-esr45']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-release']['single_locale_branch_config'] = {
+    "firefox": "mozilla-release",
+}
 BRANCHES['mozilla-esr45']['bouncer_submitter_config'] = {
     "firefox": "releases/bouncer_firefox_esr.py",
 }
 BRANCHES['mozilla-esr45']['uptake_monitoring_config'] = {
     "firefox": 'releases/bouncer_firefox_esr.py',
 }
 BRANCHES['mozilla-esr45']['postrelease_version_bump_config'] = {
     "firefox": 'releases/postrelease_firefox_esr45.py',
@@ -2772,16 +2782,19 @@ BRANCHES['mozilla-esr52']['enable_hsts_u
 BRANCHES['mozilla-esr52']['enable_hpkp_update'] = True
 BRANCHES['mozilla-esr52']['enabled_products'] = ['firefox']
 ### Release Promotion
 BRANCHES['mozilla-esr52']['enable_release_promotion'] = {
     "firefox": True,
 }
 # used by process/release.py
 BRANCHES['mozilla-esr52']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-release']['single_locale_branch_config'] = {
+    "firefox": "mozilla-release",
+}
 BRANCHES['mozilla-esr52']['bouncer_submitter_config'] = {
     "firefox": "releases/bouncer_firefox_esr.py",
 }
 BRANCHES['mozilla-esr52']['uptake_monitoring_config'] = {
     "firefox": 'releases/bouncer_firefox_esr.py',
 }
 BRANCHES['mozilla-esr52']['postrelease_version_bump_config'] = {
     "firefox": 'releases/postrelease_firefox_esr52.py',
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -179,17 +179,20 @@ PROJECT_BRANCHES = {
         'pgo_strategy': 'per-checkin',
         'enable_release_promotion': {
             "firefox": True,
             "devedition": 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-beta",
+        "single_locale_branch_config": {
+            "firefox": "dev-mozilla-beta",
+            "devedition": "dev-mozilla-beta_devedition",
+        },
         'release_channel_mappings': {
             "firefox": [["^.*$", ["beta-dev"]]],
             "devedition": [["^.*$", ["aurora-dev"]]],
         },
         'uptake_monitoring_platforms': {
             "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
             "fennec": ("android-api-15", "android-x86"),
             "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),