Bug 1255273 - Partial mar files have two channel IDs r=nthomas DONTBUILD
authorRail Aliiev <rail@mozilla.com>
Wed, 09 Mar 2016 23:20:22 -0500
changeset 311791 ec4475ef7e31ec2e9488d0c756ccb9475b941f57
parent 311790 a959b172be4ce33c2de022e84902d222876d847d
child 311792 627f6e56d31f641545ce8f41b2553bae96e1243f
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnthomas
bugs1255273
milestone48.0a1
Bug 1255273 - Partial mar files have two channel IDs r=nthomas DONTBUILD MozReview-Commit-ID: 3Nv38vsoOvr
release/docker/funsize-update-generator/scripts/funsize.py
--- a/release/docker/funsize-update-generator/scripts/funsize.py
+++ b/release/docker/funsize-update-generator/scripts/funsize.py
@@ -225,16 +225,19 @@ def main():
                                option="SourceRepository"),
             "revision": get_option(path, filename="platform.ini",
                                    section="Build", option="SourceStamp"),
             "from_mar": e["from_mar"],
             "to_mar": e["to_mar"],
             "platform": e["platform"],
             "locale": e["locale"],
         }
+        # Override ACCEPTED_MAR_CHANNEL_IDS if needed
+        if "ACCEPTED_MAR_CHANNEL_IDS" in os.environ:
+            mar_data["ACCEPTED_MAR_CHANNEL_IDS"] = os.environ["ACCEPTED_MAR_CHANNEL_IDS"]
         for field in ("update_number", "previousVersion",
                       "previousBuildNumber", "toVersion",
                       "toBuildNumber"):
             if field in e:
                 mar_data[field] = e[field]
         mar_data.update(complete_mars)
         # if branch not set explicitly use repo-name
         mar_data["branch"] = e.get("branch",