Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbotcustom, r?rail draft
authorJordan Lund <jlund@mozilla.com>
Wed, 17 May 2017 17:26:53 -0700
changeset 5156 9e4d6ecc72af9b2be4c2183a28645ec322a75d47
parent 5154 32ecfc7dc1122304f133b43d19a84e481bd59434
push id3661
push userbmo:jlund@mozilla.com
push dateThu, 18 May 2017 00:27:01 +0000
reviewersrail
bugs1365588
Bug 1365588 - fix l10n repacks for DevEdition on Beta, bbotcustom, r?rail MozReview-Commit-ID: Cb7DJCSImLE
process/release.py
--- a/process/release.py
+++ b/process/release.py
@@ -1791,25 +1791,31 @@ def generateReleasePromotionBuilders(bra
         )
 
         env_config = "single_locale/production.py"
         balrog_config = "balrog/production.py"
         if branch_config.get("staging"):
             env_config = "single_locale/staging.py"
             balrog_config = "balrog/staging.py"
 
+        single_locale_platform_config = platform
+        if product == "devedition":
+            # XXX hack: not all platforms in config.py have a devedition variant defined
+            # e.g. linux. Therefore, we do not have a clean platform namespace in buildbot-configs
+            # for this item outside of right here.
+            single_locale_platform_config = "%s_devedition" % (platform,)
+
         mh_cfg = {
             "script_name": "scripts/desktop_l10n.py",
             "extra_args": [
-                "--branch-config", "single_locale/%s.py" % branch_config.get('single_locale_branch_config',
-                                                                             branch_name),
-                "--platform-config", "single_locale/%s.py" % platform,
+                "--branch-config", "single_locale/%s.py" % branch_config['single_locale_branch_config'][product],
+                "--platform-config", "single_locale/%s.py" % single_locale_platform_config,
                 "--environment-config", env_config,
                 "--balrog-config", balrog_config,
-                                   ],
+            ],
             "script_timeout": 1800,
             "script_maxtime": 10800,
         }
 
         l10n_factory = makeMHFactory(branch_config, pf,
                                      mh_cfg=mh_cfg,
                                      signingServers=secrets.get(pf.get("dep_signing_servers")),
                                      use_credentials_file=True,