Bug 1364225 - move release_channel_mappings to product level r=mtabara
authorRail Aliiev <rail@mozilla.com>
Tue, 16 May 2017 09:44:10 -0400
changeset 7525 8a9951b2888ce3951748596867da4f6b468340aa
parent 7524 7c1c5fa1059affd4476cafbbe0172e0c60d3b240
child 7526 e4946f92cd897999f6a397e57b5dcaf38787d9ef
push id5598
push userraliiev@mozilla.com
push dateTue, 16 May 2017 13:46:40 +0000
reviewersmtabara
bugs1364225
Bug 1364225 - move release_channel_mappings to product level r=mtabara
buildfarm/release/release-runner.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -72,17 +72,17 @@ def assign_and_check_l10n_changesets(rel
     L10nSanitizer(**release).run()
 
 
 def assign_and_check_partial_updates(release_runner, release):
     release['partial_updates'] = get_partials(
         release_runner, release['partials'], release['product'])
     branchConfig = get_branch_config(release)
     release['release_channels'] = update_channels(
-        release['version'], branchConfig['release_channel_mappings'])
+        release['version'], branchConfig['release_channel_mappings'][release['product']])
     PartialsSanitizer(**release).run()
 
 
 # So people can't run arbitrary functions
 CHECKS_MAPPING = {
     'long_revision': check_and_assign_long_revision,
     'l10n_changesets': assign_and_check_l10n_changesets,
     'partial_updates': assign_and_check_partial_updates,
@@ -393,17 +393,17 @@ def main(options):
             ]
             publish_to_balrog_channels = [
                 c for c in release_channels if c not in branchConfig.get('mirror_requiring_channels', [])
             ]
             push_to_releases_enabled = False
             postrelease_mark_as_shipped_enabled = False
         else:
             postrelease_enabled = branchConfig[
-                'postrelease_version_bump_enabled']
+                'postrelease_version_bump_enabled'][release['product']]
             postrelease_bouncer_aliases_enabled = branchConfig[
                 'postrelease_bouncer_aliases_enabled']
             postrelease_mark_as_shipped_enabled = branchConfig[
                 'postrelease_mark_as_shipped_enabled']
             final_verify_channels = release_channels
             publish_to_balrog_channels = release_channels
             push_to_releases_enabled = True
 
@@ -490,24 +490,24 @@ def main(options):
                 "postrelease_bouncer_aliases_enabled": postrelease_bouncer_aliases_enabled,
                 "uptake_monitoring_enabled": branchConfig['uptake_monitoring_enabled'],
                 "tuxedo_server_url": branchConfig['tuxedoServerUrl'],
                 "postrelease_version_bump_enabled": postrelease_enabled,
                 "postrelease_mark_as_shipped_enabled": postrelease_mark_as_shipped_enabled,
                 "push_to_releases_enabled": push_to_releases_enabled,
                 "push_to_releases_automatic": branchConfig['push_to_releases_automatic'],
                 "beetmover_candidates_bucket": branchConfig["beetmover_buckets"][release["product"]],
-                "partner_repacks_platforms": branchConfig.get("partner_repacks_platforms", []),
-                "eme_free_repacks_platforms": branchConfig.get("eme_free_repacks_platforms", []),
+                "partner_repacks_platforms": branchConfig.get("partner_repacks_platforms", {}).get(release["product"], []),
+                "eme_free_repacks_platforms": branchConfig.get("eme_free_repacks_platforms", {}).get(release["product"], []),
                 "sha1_repacks_platforms": branchConfig.get("sha1_repacks_platforms", []),
                 "l10n_changesets": release['l10n_changesets'],
                 "extra_balrog_submitter_params": extra_balrog_submitter_params,
                 "publish_to_balrog_channels": publish_to_balrog_channels,
-                "snap_enabled": branchConfig.get("snap_enabled", False),
-                "update_verify_channel": branchConfig.get("update_verify_channel"),
+                "snap_enabled": branchConfig.get("snap_enabled", {}).get(release["product"], False),
+                "update_verify_channel": branchConfig.get("update_verify_channel", {}).get(release["product"]),
                 "update_verify_requires_cdn_push": branchConfig.get("update_verify_requires_cdn_push", False),
             }
 
             validate_graph_kwargs(queue, gpg_key_path, **kwargs)
             graph = make_task_graph_strict_kwargs(**kwargs)
             rr.update_status(release, "Submitting task graph")
             log.info("Task graph generated!")
             import pprint