Bug 1258059 - beta-dev should be treated as beta for RCs r=jlund draft
authorRail Aliiev <rail@mozilla.com>
Mon, 11 Apr 2016 15:31:42 -0400
changeset 6777 a397750cb457b4bac8600a1124c57c501bbf1c35
parent 6775 97e4b470add359bafcfd4c2f047c1cab42f752df
push id54
push userbmo:rail@mozilla.com
push dateMon, 11 Apr 2016 19:32:09 +0000
reviewersjlund
bugs1258059
Bug 1258059 - beta-dev should be treated as beta for RCs r=jlund MozReview-Commit-ID: LsdzbbbxT8y
lib/python/balrog/submitter/cli.py
--- a/lib/python/balrog/submitter/cli.py
+++ b/lib/python/balrog/submitter/cli.py
@@ -182,32 +182,33 @@ 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"):
+            if not requiresMirrors and c in ("beta", "beta-cdntest",
+                                             "beta-dev", "beta-dev-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 = "%s-%s.complete.mar" % (productName.lower(), 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"):
+                if not requiresMirrors and channel in ("beta", "beta-cdntest", "beta-dev", "beta-dev-cdntest"):
                     bouncerProduct = "%s-%sbuild%s-complete" % (productName.lower(), version, buildNumber)
                 else:
                     if productName.lower() == "fennec":
                         bouncerProduct = "%s-%s" % (productName.lower(), version)
                     else:
                         bouncerProduct = "%s-%s-complete" % (productName.lower(), version)
                 url = 'http://%s/?product=%s&os=%%OS_BOUNCER%%&lang=%%LOCALE%%' % (bouncerServer, bouncerProduct)
                 data["fileUrls"][channel]["completes"]["*"] = url
@@ -224,17 +225,17 @@ class ReleaseCreatorV4(ReleaseCreatorBas
                 if "localtest" in channel:
                     dir_ = makeCandidatesDir(productName.lower(), version,
                                             buildNumber, server=ftpServer,
                                             protocol='http')
                     filename = "%s-%s-%s.partial.mar" % (productName.lower(), 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"):
+                    if not requiresMirrors and channel in ("beta", "beta-cdntest", "beta-dev", "beta-dev-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