Bug 1367978 - Devedition l10n repacks should use nightly certs r=jlorenzo draft
authorRail Aliiev <rail@mozilla.com>
Fri, 26 May 2017 02:46:28 -0400
changeset 5159 623baa9a4d4da5bb5bb22d50bd350d4ab05d503f
parent 5158 64cfcddf9a27c39d84b53cd9091c27a939dbace1
push id3662
push userbmo:rail@mozilla.com
push dateFri, 26 May 2017 06:46:35 +0000
reviewersjlorenzo
bugs1367978
Bug 1367978 - Devedition l10n repacks should use nightly certs r=jlorenzo MozReview-Commit-ID: 5cEYqpttMjq
process/release.py
--- a/process/release.py
+++ b/process/release.py
@@ -1776,16 +1776,23 @@ def generateReleaseBranchObjects(release
 
 
 def generateReleasePromotionBuilders(branch_config, branch_name, product,
                                      secrets):
     builders = []
     category_name = "release-%s" % branch_name
     tools_repo_path = branch_config.get('build_tools_repo_path')
     tools_repo = '%s%s' % (branch_config['hgurl'], tools_repo_path)
+    # Devedition uses the same platform names with Firefox for its release
+    # builders. Additionally, not all platforms have their signig sever configs
+    # set, because they are moved to TaskCluster.
+    signing_servers = secrets.get("release-signing")
+    if product == "devedition":
+        signing_servers = secrets.get("nightly-signing")
+
 
     for platform in branch_config["l10n_release_platforms"]:
         pf = branch_config["platforms"][platform]
         l10n_buildername = "release-{branch}_{product}_{platform}_l10n_repack".format(
             branch=branch_name,
             product=product,
             platform=platform,
         )
@@ -1812,17 +1819,17 @@ def generateReleasePromotionBuilders(bra
                 "--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")),
+                                     signingServers=signing_servers,
                                      use_credentials_file=True,
                                      )
         l10n_builder = {
             "name": l10n_buildername,
             "factory": l10n_factory,
             "builddir": l10n_buildername,
             "slavebuilddir": normalizeName(l10n_buildername),
             "slavenames": pf["slaves"],
@@ -2054,17 +2061,17 @@ def generateReleasePromotionBuilders(bra
             "--bucket-name-full", branch_config["beetmover_buckets"][product],
             "--credentials", branch_config["beetmover_credentials"],
             "--tools-repo", branch_config["platforms"]["linux64"]["tools_repo_cache"],
         ] + extra_extra_args
     }
     checksums_factory = makeMHFactory(
         config=branch_config, pf=branch_config['platforms']['linux64'],
         mh_cfg=checksums_mh_cfg,
-        signingServers=secrets.get("release-signing"),
+        signingServers=signing_servers,
     )
     checksums_builder = {
         'name': checksums_buildername,
         'slavenames': branch_config['platforms']['linux']['slaves'] +
                       branch_config['platforms']['linux64']['slaves'],
         'category': category_name,
         'builddir': checksums_buildername,
         'slavebuilddir': normalizeName(checksums_buildername),
@@ -2089,17 +2096,17 @@ def generateReleasePromotionBuilders(bra
         cfg = branch_config['partner_repack_config'][product]
         mh_cfg = {
             "script_name": cfg['script_name'],
             "script_maxtime": 6*3600,
             "extra_args": cfg['extra_args'] + ["--platform", platform,
                                                "--hgrepo", branch_config['repo_path']]
         }
         partner_repack_factory = makeMHFactory(
-            signingServers=secrets.get(pf.get("dep_signing_servers")),
+            signingServers=signing_servers,
             config=branch_config,
             pf=branch_config["platforms"]["macosx64"],
             mh_cfg=mh_cfg)
 
         builders.append({
             'name': buildername,
             'slavenames': branch_config['platforms']['macosx64']['slaves'],
             'category': category_name,