Bug 1288434 - tweak release runner for mark as shipped builder. r=rail
MozReview-Commit-ID: HtmBdMsMFgN
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -322,19 +322,21 @@ def main(options):
postrelease_bouncer_aliases_enabled = False
final_verify_channels = [
c for c in release_channels if c not in branchConfig.get('mirror_requiring_channels', [])
]
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_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
rc = 0
for release in rr.new_releases:
graph_id = slugId()
try:
@@ -388,16 +390,17 @@ def main(options):
"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'],
"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", []),
"l10n_changesets": l10n_changesets,
"extra_balrog_submitter_params": extra_balrog_submitter_params,
"publish_to_balrog_channels": publish_to_balrog_channels,
}
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -236,16 +236,17 @@ def make_task_graph_strict_kwargs(appVer
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,
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):
"""simple wrapper that sanitizes whatever calls make_task_graph uses universally known kwargs"""
kwargs = dict(
@@ -270,16 +271,17 @@ def make_task_graph_strict_kwargs(appVer
l10n_config=l10n_config,
mozharness_changeset=mozharness_changeset,
next_version=next_version,
partial_updates=partial_updates,
partner_repacks_platforms=partner_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,
push_to_releases_enabled=push_to_releases_enabled,
release_channels=release_channels,
repo_path=repo_path,
revision=revision,