Bug 1396517 - Make Fennec graph 2 not reference graph 1 r=mtabara
MozReview-Commit-ID: 7xvkB1Vrnq5
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -520,25 +520,26 @@ def main(options):
"publish_to_balrog_channels": publish_to_balrog_channels,
"snap_enabled": branchConfig.get("snap_enabled", {}).get(release["product"], False),
"update_verify_channel": branchConfig.get("update_verify_channel", {}).get(release["product"]),
"update_verify_requires_cdn_push": branchConfig.get("update_verify_requires_cdn_push", False),
}
# TODO: en-US validation for multiple tasks
# validate_graph_kwargs(queue, gpg_key_path, **kwargs)
- task_group_id, toplevel_task_id, tasks = make_task_graph_strict_kwargs(**kwargs)
+ task_group_id, tasks, _ = make_task_graph_strict_kwargs(**kwargs)
+ decision_task_id = task_group_id
rr.update_status(release, "Submitting tasks")
log.info("Tasks generated!")
import pprint
for task_id, task_def in tasks.items():
log.debug("%s ->\n%s", task_id,
pprint.pformat(task_def, indent=4, width=160))
submit_parallelized(queue, tasks)
- resolve_task(queue, toplevel_task_id)
+ resolve_task(queue, decision_task_id)
rr.mark_as_completed(release)
l10n_url = rr.release_l10n_api.getL10nFullUrl(release['name'])
email_release_drivers(smtp_server=smtp_server, from_=notify_from,
to=notify_to, release=release,
task_group_id=task_group_id, l10n_url=l10n_url)
except Exception as exception:
# We explicitly do not raise an error here because there's no
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -116,31 +116,40 @@ def main(release_runner_config, release_
"postrelease_mark_as_shipped_enabled": release_config["postrelease_mark_as_shipped_enabled"],
# TODO: use [] when snaps_enabled is landed
"snap_enabled": release_config.get("snap_enabled", False),
"update_verify_channel": release_config["update_verify_channel"],
"update_verify_requires_cdn_push": release_config["update_verify_requires_cdn_push"],
"release_eta": release_config.get("release_eta"),
}
- task_group_id, toplevel_task_id, tasks = make_task_graph_strict_kwargs(**kwargs)
+ task_group_id, tasks, second_task_group_id = make_task_graph_strict_kwargs(**kwargs)
+ toplevel_task_id = task_group_id
log.info('Tasks generated, but not yet submitted to Taskcluster.')
import pprint
for task_id, task_def in tasks.items():
log.debug("%s ->\n%s", task_id,
pprint.pformat(task_def, indent=4, width=160))
if not options.dry_run:
submit_parallelized(queue, tasks)
resolve_task(queue, toplevel_task_id)
- log_line = 'Task graph submitted: https://tools.taskcluster.net/groups/{}'.format(task_group_id)
- log.info(log_line)
- # TODO: We shouldn't need this extra print, but at the moment, calling the script in verbose
- # mode doesn't output anything.
- print log_line
+
+ _print_task_group_id(task_group_id)
+ if second_task_group_id:
+ _print_task_group_id(second_task_group_id, index=2)
+
+
+def _print_task_group_id(group_id, index=''):
+ index = index if index == '' else ' {}'.format(index)
+ log_line = 'Task graph{} submitted: https://tools.taskcluster.net/groups/{}'.format(index, group_id)
+ log.info(log_line)
+ # TODO: We shouldn't need this extra print, but at the moment, calling the script in verbose
+ # mode doesn't output anything.
+ print log_line
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"]