Bug 1358607 - adjust release runner to account for devedition config vars. r=rail
MozReview-Commit-ID: EZZzuHY6wBc
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -464,17 +464,21 @@ def main(options):
"verifyConfigs": {},
"balrog_api_root": branchConfig["balrog_api_root"],
"funsize_balrog_api_root": branchConfig["funsize_balrog_api_root"],
"balrog_username": balrog_username,
"balrog_password": balrog_password,
"beetmover_aws_access_key_id": beetmover_aws_access_key_id,
"beetmover_aws_secret_access_key": beetmover_aws_secret_access_key,
# TODO: stagin specific, make them configurable
- "signing_class": "release-signing",
+ "signing_class": branchConfig['signing_class'][release["product"]],
+ "accepted_mar_channel_id": branchConfig.get('accepted_mar_channel_id'{}).get(release["product"]),
+ "signing_cert": branchConfig['signing_cert'][release["product"]],
+ "moz_disable_mar_cert_verification": branchConfig.get('moz_disable_mar_cert_verification'),
+ "root_home_dir": branchConfig['root_home_dir'][release["product"]],
"bouncer_enabled": branchConfig["bouncer_enabled"],
"updates_builder_enabled": branchConfig["updates_builder_enabled"],
"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['uptake_monitoring_platforms'][release["product"]],
"signing_pvt_key": signing_pvt_key,
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -36,32 +36,35 @@ def main(release_runner_config, release_
kwargs = {
# release-runner.ini
"signing_pvt_key": release_config['signing_pvt_key'],
"public_key": release_config['docker_worker_key'],
"balrog_username": release_config['balrog_username'],
"balrog_password": release_config['balrog_password'],
"beetmover_aws_access_key_id": release_config['beetmover_aws_access_key_id'],
"beetmover_aws_secret_access_key": release_config['beetmover_aws_secret_access_key'],
- "signing_class": "release-signing", # TODO: stagin specific, make them configurable
-
# ship-it items
"version": release_config["version"],
"revision": release_config["mozilla_revision"],
"mozharness_changeset": release_config.get("mozharness_changeset") or release_config["mozilla_revision"],
"buildNumber": release_config["build_number"],
"l10n_changesets": release_config["l10n_changesets"],
# was branchConfig items
"funsize_balrog_api_root": release_config["funsize_balrog_api_root"],
"balrog_api_root": release_config["balrog_api_root"],
"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"],
+ "signing_class": release_config["signing_class"],
+ "accepted_mar_channel_id": release_config.get("accepted_mar_channel_id"),
+ "signing_cert": release_config["signing_cert"],
+ "moz_disable_mar_cert_verification": release_config.get("moz_disable_mar_cert_verification"),
+ "root_home_dir": release_config["root_home_dir"],
"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'],
# TODO: temporary config enabled during 53 Fennec beta cycle
"candidates_fennec_enabled": release_config.get('candidates_fennec_enabled'),
"stage_product": release_config['stage_product'],
"postrelease_bouncer_aliases_enabled": release_config['postrelease_bouncer_aliases_enabled'],
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -242,26 +242,26 @@ def bump_version(version):
v[-1] = str(int(v[-1]) + 1)
return split_by.join(v) + suffix
def make_task_graph_strict_kwargs(appVersion, balrog_api_root, balrog_password, balrog_username,
beetmover_aws_access_key_id, beetmover_aws_secret_access_key,
beetmover_candidates_bucket, bouncer_enabled, branch, buildNumber,
build_tools_repo_path, candidates_fennec_enabled,
- checksums_enabled, en_US_config,
+ checksums_enabled, en_US_config, root_home_dir,
extra_balrog_submitter_params, final_verify_channels,
final_verify_platforms, uptake_monitoring_platforms,
- funsize_balrog_api_root, l10n_config,
+ funsize_balrog_api_root, l10n_config, signing_cert,
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,
+ postrelease_version_bump_enabled, moz_disable_mar_cert_verification,
+ postrelease_mark_as_shipped_enabled, accepted_mar_channel_id,
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"""
@@ -300,16 +300,20 @@ def make_task_graph_strict_kwargs(appVer
public_key=public_key,
push_to_candidates_enabled=push_to_candidates_enabled,
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,
+ accepted_mar_channel_id=accepted_mar_channel_id,
+ signing_cert=signing_cert,
+ moz_disable_mar_cert_verification=moz_disable_mar_cert_verification,
+ root_home_dir=root_home_dir,
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,