Bug 1278312 - fix uptake monitoring for relpro graph2. r=rail
MozReview-Commit-ID: BippzAjgsnu
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -420,16 +420,17 @@ def main(options):
# TODO: stagin specific, make them configurable
"signing_class": "release-signing",
"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['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,
"push_to_releases_enabled": push_to_releases_enabled,
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -67,16 +67,17 @@ def main(release_runner_config, release_
"partner_repacks_platforms": release_config["partner_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"],
"checksums_enabled": release_config["checksums_enabled"],
"updates_enabled": release_config["updates_enabled"],
"push_to_releases_enabled": release_config["push_to_releases_enabled"],
"verifyConfigs": {},
"next_version": bump_version(release_config["version"]),
"appVersion": getAppVersion(release_config["version"]),
@@ -111,33 +112,34 @@ def main(release_runner_config, release_
def get_items_from_common_tc_task(common_task_id, tc_config):
tc_task_items = {}
queue = Queue(tc_config)
task = queue.task(common_task_id)
tc_task_items["version"] = task["extra"]["build_props"]["version"]
tc_task_items["build_number"] = task["extra"]["build_props"]["build_number"]
tc_task_items["mozilla_revision"] = task["extra"]["build_props"]["revision"]
+ tc_task_items["partials"] = task["extra"]["build_props"]["partials"]
return tc_task_items
def get_unique_release_items(options, tc_config):
unique_items = {}
if options.common_task_id:
# sometimes, we make a release based on a previous release. e.g. a graph that represents
# part 2 of a Firefox Release Candidate release
- # TODO extract partials, mozharness_revision, and l10n_changesets from common taskgroup
+ # TODO extract mozharness_revision, and l10n_changesets from common taskgroup
unique_items.update(get_items_from_common_tc_task(options.common_task_id, tc_config))
else:
unique_items['version'] = options.version
unique_items['build_number'] = options.build_number
unique_items['mozilla_revision'] = options.mozilla_revision
+ unique_items['partials'] = options.partials
- unique_items['partials'] = options.partials
unique_items['mozharness_revision'] = options.mozharness_revision
# TODO have ability to pass l10n_changesets whether based on previous release or new one
unique_items["l10n_changesets"] = {}
return unique_items
def get_release_items_from_runner_config(release_runner_ini):
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -230,17 +230,18 @@ def bump_version(version):
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, checksums_enabled, en_US_config,
extra_balrog_submitter_params, final_verify_channels,
- final_verify_platforms, funsize_balrog_api_root, l10n_config,
+ 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,
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,
@@ -258,16 +259,17 @@ def make_task_graph_strict_kwargs(appVer
bouncer_enabled=bouncer_enabled,
branch=branch,
buildNumber=buildNumber,
build_tools_repo_path=build_tools_repo_path,
checksums_enabled=checksums_enabled,
en_US_config=en_US_config,
final_verify_channels=final_verify_channels,
final_verify_platforms=final_verify_platforms,
+ 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,
postrelease_bouncer_aliases_enabled=postrelease_bouncer_aliases_enabled,