Bug 1366070 - Pass --product to Balrog submitters r=bhearsum
authorRail Aliiev <rail@mozilla.com>
Tue, 23 May 2017 13:24:23 -0400
changeset 7759 539aad7e9f25b2c2b1b53cbdb41104272e2b0ef6
parent 7758 6615ff0a8876c60f3fb873ddd7e6c373ba568767
child 7760 656d6c89931f4b433625db3d65f74fe52e68b894
child 7761 174f596434c8b63880e960abb9b3b546c42280c1
child 7762 8b34e0e278d680c0d62922c90d61b5b6d38f5b5c
push id217
push userbmo:rail@mozilla.com
push dateTue, 23 May 2017 17:24:31 +0000
reviewersbhearsum
bugs1366070
Bug 1366070 - Pass --product to Balrog submitters r=bhearsum MozReview-Commit-ID: 4CtfABYuyWU
buildfarm/release/release-runner.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -329,17 +329,17 @@ def main(options):
     }
     # Extend tc_config for retries, see Bug 1293744
     # https://github.com/taskcluster/taskcluster-client.py/blob/0.0.24/taskcluster/client.py#L30
     # This is a stopgap until Bug 1259627 is fixed.
     retrying_tc_config = tc_config.copy()
     retrying_tc_config.update({"maxRetries": 12})
     balrog_username = config['balrog'].get("username")
     balrog_password = config["balrog"].get("password")
-    extra_balrog_submitter_params = config["balrog"].get("extra_balrog_submitter_params")
+    extra_balrog_submitter_params = config["balrog"].get("extra_balrog_submitter_params", "")
     beetmover_aws_access_key_id = config["beetmover"].get("aws_access_key_id")
     beetmover_aws_secret_access_key = config["beetmover"].get("aws_secret_access_key")
     gpg_key_path = config["signing"].get("gpg_key_path")
 
     # TODO: replace release sanity with direct checks of en-US and l10n
     # revisions (and other things if needed)
 
     rr = ReleaseRunner(api_root=api_root, username=username, password=password)
@@ -495,17 +495,17 @@ def main(options):
                 "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", {}).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,
+                "extra_balrog_submitter_params": extra_balrog_submitter_params + " --product " + release["product"].capitalize(),
                 "publish_to_balrog_channels": publish_to_balrog_channels,
                 "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)