Bug 1343990 - alter release runner to encompass stage_product as well. r=rail THUNDERBIRD_52_0_BUILD1
authorMihai Tabara <mtabara@mozilla.com>
Wed, 08 Mar 2017 17:21:46 +0000
changeset 7368 988c20890711
parent 7367 df2bb7b310c6
child 7369 d0dad72bf6c7
push id5486
push usermtabara@mozilla.com
push dateThu, 09 Mar 2017 11:11:30 +0000
reviewersrail
bugs1343990
Bug 1343990 - alter release runner to encompass stage_product as well. r=rail MozReview-Commit-ID: BQG5tBzlaYc
buildfarm/release/release-runner.py
buildfarm/release/releasetasks_graph_gen.py
lib/python/kickoff/__init__.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -475,16 +475,17 @@ def main(options):
                 "update_verify_enabled": branchConfig["update_verify_enabled"],
                 "release_channels": release_channels,
                 "final_verify_channels": final_verify_channels,
                 "final_verify_platforms": branchConfig['release_platforms'],
                 "uptake_monitoring_platforms": branchConfig['release_platforms'],
                 "signing_pvt_key": signing_pvt_key,
                 "build_tools_repo_path": branchConfig['build_tools_repo_path'],
                 "push_to_candidates_enabled": branchConfig['push_to_candidates_enabled'],
+                "stage_product": branchConfig['stage_product'][release['product']],
                 "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"]],
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -56,16 +56,17 @@ def main(release_runner_config, release_
         "build_tools_repo_path": release_config['build_tools_repo_path'],
         "tuxedo_server_url": release_config['tuxedo_server_url'],
         "uptake_monitoring_enabled": release_config['uptake_monitoring_enabled'],
         "beetmover_candidates_bucket": release_config["beetmover_candidates_bucket"],
         "bouncer_enabled": release_config["bouncer_enabled"],
         "updates_builder_enabled": release_config["updates_builder_enabled"],
         "update_verify_enabled": release_config["update_verify_enabled"],
         "push_to_candidates_enabled": release_config['push_to_candidates_enabled'],
+        "stage_product": release_config['stage_product'],
         "postrelease_bouncer_aliases_enabled": release_config['postrelease_bouncer_aliases_enabled'],
         "postrelease_version_bump_enabled": release_config['postrelease_version_bump_enabled'],
         "push_to_releases_automatic": release_config['push_to_releases_automatic'],
         "partner_repacks_platforms": release_config["partner_repacks_platforms"],
         "eme_free_repacks_platforms": release_config["eme_free_repacks_platforms"],
         "sha1_repacks_platforms": release_config["sha1_repacks_platforms"],
         "repo_path": release_config["repo_path"],
         "branch": release_config["branch"],
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -251,17 +251,17 @@ def make_task_graph_strict_kwargs(appVer
                                   final_verify_platforms, uptake_monitoring_platforms,
                                   funsize_balrog_api_root, l10n_config,
                                   l10n_changesets, mozharness_changeset, next_version,
                                   partial_updates, partner_repacks_platforms,
                                   eme_free_repacks_platforms, sha1_repacks_platforms,
                                   postrelease_bouncer_aliases_enabled, uptake_monitoring_enabled,
                                   postrelease_version_bump_enabled,
                                   postrelease_mark_as_shipped_enabled,
-                                  product, public_key, push_to_candidates_enabled,
+                                  product, public_key, stage_product, push_to_candidates_enabled,
                                   push_to_releases_automatic, push_to_releases_enabled, release_channels,
                                   repo_path, revision, signing_class, signing_pvt_key, source_enabled,
                                   tuxedo_server_url, update_verify_enabled, updates_builder_enabled,
                                   updates_enabled, verifyConfigs, version, publish_to_balrog_channels,
                                   snap_enabled, update_verify_channel, update_verify_requires_cdn_push):
     """simple wrapper that sanitizes whatever calls make_task_graph uses universally known kwargs"""
 
     kwargs = dict(
@@ -300,16 +300,17 @@ def make_task_graph_strict_kwargs(appVer
         push_to_releases_automatic=push_to_releases_automatic,
         push_to_releases_enabled=push_to_releases_enabled,
         release_channels=release_channels,
         repo_path=repo_path,
         revision=revision,
         signing_class=signing_class,
         signing_pvt_key=signing_pvt_key,
         source_enabled=source_enabled,
+        stage_product=stage_product,
         tuxedo_server_url=tuxedo_server_url,
         update_verify_enabled=update_verify_enabled,
         updates_builder_enabled=updates_builder_enabled,
         updates_enabled=updates_enabled,
         verifyConfigs=verifyConfigs,
         version=version,
         publish_to_balrog_channels=publish_to_balrog_channels,
         snap_enabled=snap_enabled,