diff --git a/.cron.yml b/.cron.yml index 1a6929d59b10..758fb3f04bdc 100644 --- a/.cron.yml +++ b/.cron.yml @@ -59,14 +59,3 @@ jobs: - mozilla-central when: - {hour: 18, minute: 0} - - - name: nightly-stylo-talos - job: - type: decision-task - treeherder-symbol: T - target-tasks-method: stylo_talos - run-on-projects: - - mozilla-central - when: - - {hour: 4, minute: 0} - diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml index b3c0536d2682..c35c5a4ef6a5 100644 --- a/taskcluster/ci/test/tests.yml +++ b/taskcluster/ci/test/tests.yml @@ -1158,7 +1158,7 @@ talos-chrome: treeherder-symbol: tc-T(c) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1179,7 +1179,7 @@ talos-dromaeojs: treeherder-symbol: tc-T(d) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1200,7 +1200,7 @@ talos-g1: treeherder-symbol: tc-T(g1) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1222,7 +1222,7 @@ talos-g2: max-run-time: 3600 run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] mozharness: script: talos_script.py @@ -1242,7 +1242,7 @@ talos-g3: treeherder-symbol: tc-T(g3) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1263,7 +1263,7 @@ talos-g4: treeherder-symbol: tc-T(g4) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1284,7 +1284,7 @@ talos-other: treeherder-symbol: tc-T(o) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1305,7 +1305,7 @@ talos-svgr: treeherder-symbol: tc-T(s) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: @@ -1326,7 +1326,7 @@ talos-tp5o: treeherder-symbol: tc-T(tp) run-on-projects: by-test-platform: - linux64-stylo/.*: [] + linux64-stylo/.*: ['mozilla-central', 'try'] default: ['mozilla-beta', 'mozilla-aurora', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try'] max-run-time: 3600 mozharness: diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py index e502f40ce059..1a71a44ed54e 100644 --- a/taskcluster/taskgraph/target_tasks.py +++ b/taskcluster/taskgraph/target_tasks.py @@ -279,21 +279,3 @@ def target_tasks_stylo(full_task_graph, parameters): return False return True return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)] - - -@_target_task('stylo_talos') -def target_stylo_talos(full_task_graph, parameters): - """Target stylotasks that only run on the m-c branch.""" - def filter(task): - platform = task.attributes.get('build_platform') - # only stylo platforms - if platform != ('linux64-stylo'): - return False - # no non-e10s tests - if task.attributes.get('unittest_suite'): - if not task.attributes.get('e10s'): - return False - # only run talos - if task.attributes.get('unittest_suite') == 'talos': - return True - return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]