Bug 1334538 - Pass eme_free/sha1 configs to releasetasks. r=jlund
authorRail Aliiev <rail@mozilla.com>
Wed, 08 Feb 2017 09:40:31 -0500
changeset 7299 e0d1f4ac43080fdad05114e3d9db5fdbad9990b7
parent 7298 df2f943710552f2379a0afc8af853d937e6ed7ce
child 7300 a0bf996c53e1463e998ab222c04ceb80b93fd62f
push id5435
push userraliiev@mozilla.com
push dateWed, 08 Feb 2017 20:58:54 +0000
reviewersjlund
bugs1334538
Bug 1334538 - Pass eme_free/sha1 configs to releasetasks. r=jlund MozReview-Commit-ID: DenIKzvR1AM
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
@@ -441,16 +441,18 @@ def main(options):
                 "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", []),
+                "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"),
                 "update_verify_requires_cdn_push": branchConfig.get("update_verify_requires_cdn_push", False),
             }
 
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -60,17 +60,18 @@ def main(release_runner_config, release_
         "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'],
         "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"],
         "product": release_config["product"],
         "release_channels": release_config['channels'],
         "final_verify_channels": release_config['final_verify_channels'],
         "final_verify_platforms": release_config['final_verify_platforms'],
         "uptake_monitoring_platforms": release_config['uptake_monitoring_platforms'],
         "source_enabled": release_config["source_enabled"],
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -233,16 +233,17 @@ def make_task_graph_strict_kwargs(appVer
                                   beetmover_aws_access_key_id, beetmover_aws_secret_access_key,
                                   beetmover_candidates_bucket, bouncer_enabled, branch, buildNumber,
                                   build_tools_repo_path, checksums_enabled, en_US_config,
                                   extra_balrog_submitter_params, final_verify_channels,
                                   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,
                                   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,
@@ -268,16 +269,18 @@ def make_task_graph_strict_kwargs(appVer
         uptake_monitoring_platforms=uptake_monitoring_platforms,
         funsize_balrog_api_root=funsize_balrog_api_root,
         l10n_changesets=l10n_changesets,
         l10n_config=l10n_config,
         mozharness_changeset=mozharness_changeset,
         next_version=next_version,
         partial_updates=partial_updates,
         partner_repacks_platforms=partner_repacks_platforms,
+        eme_free_repacks_platforms=eme_free_repacks_platforms,
+        sha1_repacks_platforms=sha1_repacks_platforms,
         postrelease_bouncer_aliases_enabled=postrelease_bouncer_aliases_enabled,
         uptake_monitoring_enabled=uptake_monitoring_enabled,
         postrelease_version_bump_enabled=postrelease_version_bump_enabled,
         postrelease_mark_as_shipped_enabled=postrelease_mark_as_shipped_enabled,
         product=product,
         public_key=public_key,
         push_to_candidates_enabled=push_to_candidates_enabled,
         push_to_releases_automatic=push_to_releases_automatic,