Bug 1616641 - let fennec-nightly tasks ride along vanilla fenix nightlies

.cron.yml

@@ -12,12 +12,6 @@ jobs:
       when:
           - {hour: 6, minute: 0}
           - {hour: 18, minute: 0}
-    - name: fennec-nightly
-      job:
-          type: decision-task
-          treeherder-symbol: N-fennec
-          target-tasks-method: fennec-nightly
-      when: []  # Force hook only
     - name: fennec-beta
       job:
           type: decision-task

taskcluster/fenix_taskgraph/target_tasks.py

@@ -30,10 +30,7 @@ def target_tasks_nightly(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a nightly build."""
 
     def filter(task, parameters):
-        return (
-            task.attributes.get("nightly", False) and
-            not _filter_fennec("nightly", task, parameters)
-        )
+        return task.attributes.get("nightly", False)
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
 
@@ -42,13 +39,6 @@ def _filter_fennec(fennec_type, task, parameters):
     return task.attributes.get("build-type", "") == "fennec-{}".format(fennec_type)
 
 
-@_target_task("fennec-nightly")
-def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
-    """Select the set of tasks required for a nightly build signed with the fennec key."""
-
-    return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("nightly", t, parameters)]
-
-
 @_target_task("fennec-beta")
 def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a beta build signed with the fennec key."""