Bug 1326462 - Make the check for duplicate gecko v2 routes, happen during full graph; r?Callek
MozReview-Commit-ID: HkHpfvcjlQG
--- a/taskcluster/taskgraph/generator.py
+++ b/taskcluster/taskgraph/generator.py
@@ -192,16 +192,17 @@ class TaskGraphGenerator(object):
edges = set()
for t in full_task_set:
for dep, depname in t.get_dependencies(full_task_set):
edges.add((t.label, dep, depname))
full_task_graph = TaskGraph(all_tasks,
Graph(full_task_set.graph.nodes, edges))
full_task_graph.for_each_task(verify_task_graph_symbol, scratch_pad={})
+ full_task_graph.for_each_task(verify_gecko_v2_routes, scratch_pad={})
logger.info("Full task graph contains %d tasks and %d dependencies" % (
len(full_task_set.graph.nodes), len(edges)))
yield 'full_task_graph', full_task_graph
logger.info("Generating target task set")
target_task_set = TaskGraph(dict(all_tasks),
Graph(set(all_tasks.keys()), set()))
for fltr in self.filters:
@@ -217,17 +218,16 @@ class TaskGraphGenerator(object):
yield 'target_task_set', target_task_set
logger.info("Generating target task graph")
target_graph = full_task_graph.graph.transitive_closure(target_tasks)
target_task_graph = TaskGraph(
{l: all_tasks[l] for l in target_graph.nodes},
target_graph)
- target_task_graph.for_each_task(verify_gecko_v2_routes, scratch_pad={})
yield 'target_task_graph', target_task_graph
logger.info("Generating optimized task graph")
do_not_optimize = set()
if not self.parameters.get('optimize_target_tasks', True):
do_not_optimize = target_task_set.graph.nodes
optimized_task_graph, label_to_taskid = optimize_task_graph(target_task_graph,