Bug 1407331 - Staging releases: Remove *-dev update channel draft
authorJohan Lorenzo <jlorenzo@mozilla.com>
Thu, 12 Oct 2017 13:56:16 +0200
changeset 8185 a42ba3c9d6c6573821d3df4482a4bf738500613e
parent 8182 8842d45778863f1380200ca187edd197e684573c
push id257
push userbmo:jlorenzo@mozilla.com
push dateThu, 12 Oct 2017 12:20:17 +0000
bugs1407331
Bug 1407331 - Staging releases: Remove *-dev update channel MozReview-Commit-ID: 3SZxAhZ1WIy
lib/python/balrog/submitter/cli.py
--- a/lib/python/balrog/submitter/cli.py
+++ b/lib/python/balrog/submitter/cli.py
@@ -203,33 +203,32 @@ class ReleaseCreatorV4(ReleaseCreatorBas
             # localtest channels are different than the default because they
             # point directly at FTP rather than Bouncer.
             if "localtest" in c:
                 uniqueChannels.append(c)
             # beta and beta-cdntest are special, but only if requiresMirrors is
             # set to False. This is typically used when generating beta channel
             # updates as part of RC builds, which get shipped prior to the
             # release being pushed to mirrors. This is a bit of a hack.
-            if not requiresMirrors and c in ("beta", "beta-cdntest",
-                                             "beta-dev", "beta-dev-cdntest"):
+            if not requiresMirrors and c in ("beta", "beta-cdntest"):
                 uniqueChannels.append(c)
 
         for channel in uniqueChannels:
             data["fileUrls"][channel] = {
                 "completes": {}
             }
             if "localtest" in channel:
                 dir_ = makeCandidatesDir(productName.lower(), version,
                                          buildNumber, server=ftpServer,
                                          protocol='http')
                 filename = self.complete_mar_filename_pattern % (file_prefix, version)
                 data["fileUrls"][channel]["completes"]["*"] = "%supdate/%%OS_FTP%%/%%LOCALE%%/%s" % (dir_, filename)
             else:
                 # See comment above about these channels for explanation.
-                if not requiresMirrors and channel in ("beta", "beta-cdntest", "beta-dev", "beta-dev-cdntest"):
+                if not requiresMirrors and channel in ("beta", "beta-cdntest"):
                     bouncerProduct = "%s-%sbuild%s-complete" % (productName.lower(), version, buildNumber)
                 else:
                     if productName.lower() == "fennec":
                         bouncerProduct = "%s-%s" % (productName.lower(), version)
                     else:
                         bouncerProduct = self.complete_mar_bouncer_product_pattern % (productName.lower(), version)
                 url = 'http://%s/?product=%s&os=%%OS_BOUNCER%%&lang=%%LOCALE%%' % (bouncerServer, bouncerProduct)
                 data["fileUrls"][channel]["completes"]["*"] = url
@@ -246,17 +245,17 @@ class ReleaseCreatorV4(ReleaseCreatorBas
                 if "localtest" in channel:
                     dir_ = makeCandidatesDir(productName.lower(), version,
                                             buildNumber, server=ftpServer,
                                             protocol='http')
                     filename = "%s-%s-%s.partial.mar" % (file_prefix, previousVersion, version)
                     data["fileUrls"][channel]["partials"][from_] = "%supdate/%%OS_FTP%%/%%LOCALE%%/%s" % (dir_, filename)
                 else:
                     # See comment above about these channels for explanation.
-                    if not requiresMirrors and channel in ("beta", "beta-cdntest", "beta-dev", "beta-dev-cdntest"):
+                    if not requiresMirrors and channel in ("beta", "beta-cdntest"):
                         bouncerProduct = "%s-%sbuild%s-partial-%sbuild%s" % (productName.lower(), version, buildNumber, previousVersion, previousInfo["buildNumber"])
                     else:
                         bouncerProduct = "%s-%s-partial-%s" % (productName.lower(), version, previousVersion)
                     url = 'http://%s/?product=%s&os=%%OS_BOUNCER%%&lang=%%LOCALE%%' % (bouncerServer, bouncerProduct)
                     data["fileUrls"][channel]["partials"][from_] = url
 
         return data