From 045e660d3164b7f2bfbfab1e6fb995fad0b5e496 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 16 Feb 2017 18:47:28 -0500
Subject: [PATCH] Bug 1338610 - Remove Taskcluster configs for mochitest-other.
 r=jmaher

--HG--
extra : rebase_source : 6f454998d862361752ff6a36b8242503cae7b2c8
---
 taskcluster/ci/test/test-sets.yml |  8 ++++----
 taskcluster/ci/test/tests.yml     | 22 ----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index eb1c0acbe175..58d152ca1fb2 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -125,11 +125,10 @@ windows-vm-tests:
 #    - mochitest-webgl
 
 # these tests currently run on hardware, but may migrate above when validated
-# note: on win, mochitest-a11y and mochitest-chrome come under mochitest-other
-# windows-hw-tests:
+#    - mochitest-a11y
+#    - mochitest-chrome
 #    - mochitest-clipboard
 #    - mochitest-gpu
-#    - mochitest-other
 
 macosx64-tests-debug:
     - cppunit
@@ -138,13 +137,14 @@ macosx64-tests-debug:
     - jsreftest
     # - marionette
     # - mochitest
+    # - mochitest-a11y
     # - mochitest-browser-chrome
+    # - mochitest-chrome
     # - mochitest-clipboard
     # - mochitest-devtools-chrome
     # - mochitest-gpu
     # - mochitest-jetpack
     # - mochitest-media
-    # - mochitest-other
     - mochitest-webgl
     # - reftest
     # - web-platform-tests
diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
index dd0714bceafd..ba772a5a8c1b 100644
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -757,28 +757,6 @@ mochitest-media:
                 extra-options:
                     - --mochitest-suite=mochitest-media
 
-mochitest-other:
-    description: "Mochitest other"
-    suite: mochitest/other
-    treeherder-symbol: tc-M(oth)
-    e10s: false
-    max-run-time: 5400
-    mozharness:
-        script: mozharness/scripts/desktop_unittest.py
-        no-read-buildbot-config: true
-        include-blob-upload-branch: true
-        chunked: true
-        config:
-          by-test-platform:
-            macosx.*:
-              - remove_executables.py
-              - unittests/mac_unittest.py
-            linux.*:
-              - unittests/linux_unittest.py
-              - remove_executables.py
-        extra-options:
-            - --mochitest-suite=chrome,a11y
-
 mochitest-valgrind:
     description: "Mochitest plain Valgrind run"
     suite: mochitest/valgrind-plain