bug 1457034 - switch to in-tree partner config generation. r=rail
authorAki Sasaki <asasaki@mozilla.com>
Tue, 01 May 2018 18:50:22 -0700
changeset 8399 6cb67381ed9a
parent 8398 7aa86813836d
child 8400 b2e60ccf04cb
push id6129
push userasasaki@mozilla.com
push dateMon, 07 May 2018 20:26:07 +0000
reviewersrail
bugs1457034
bug 1457034 - switch to in-tree partner config generation. r=rail
buildfarm/release/release-runner3.py
--- a/buildfarm/release/release-runner3.py
+++ b/buildfarm/release/release-runner3.py
@@ -222,22 +222,19 @@ def main(options):
                     # XXX The current plan is to run promote_firefox_rc, then
                     # ship_firefox_rc, then push_firefox, then ship_firefox.
                     # We need to support this workflow. However, rr3 doesn't
                     # support anything more than the first action task yet,
                     # so this isn't a missing feature for RCs specifically.
                     action_task_input["release_promotion_flavor"] = "{}_rc".format(
                         action_task_input["release_promotion_flavor"]
                     )
-            if is_partner_enabled(release, partner_config['partner_min_version']):
-                action_task_input['release_partner_config'] = {}
-                for kind, url in partner_config['partner_urls'].items():
-                    action_task_input['release_partner_config'][kind] = get_partner_config_by_url(
-                        url, kind, github_token
-                    )
+            if not is_partner_enabled(release, partner_config['partner_min_version']):
+                action_task_input['release_enable_emefree'] = False
+                action_task_input['release_enable_partners'] = False
             action_task_id, action_task = generate_action_task(
                 project=release["branchShortName"],
                 revision=release["mozillaRevision"],
                 action_task_input=action_task_input,
             )
             submit_action_task(queue=queue, action_task_id=action_task_id,
                                action_task=action_task)
             rr.mark_as_completed(release)