From ae294c3fd8a7ef13ecf164ee214f25b25e8ee13f Mon Sep 17 00:00:00 2001 From: Mihai Tabara Date: Thu, 20 Feb 2020 16:37:03 +0000 Subject: [PATCH] Let fennec-nightly ride along vanilla fenix-nightlies (#8579) --- .cron.yml | 6 ------ taskcluster/fenix_taskgraph/target_tasks.py | 12 +----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.cron.yml b/.cron.yml index b5ee6f5c7..36b1fd318 100644 --- a/.cron.yml +++ b/.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 diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py index efa0ec1e3..fd2028be9 100644 --- a/taskcluster/fenix_taskgraph/target_tasks.py +++ b/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."""