Bug 1265773 - Re-organize Linux64 taskcluster test tasks; r=armenzg
authorGeoff Brown <gbrown@mozilla.com>
Thu, 21 Apr 2016 10:59:14 -0600
changeset 332223 fb4131318add3451da9aea822130078ad4d02c18
parent 332222 abadd42a8e35e2e574666f62450774130d3170df
child 332224 fc8b1d87af43d7e5232e4d619651e293fa778527
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg
bugs1265773
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1265773 - Re-organize Linux64 taskcluster test tasks; r=armenzg
testing/taskcluster/tasks/branches/base_jobs.yml
testing/taskcluster/tasks/branches/try/job_flags.yml
testing/taskcluster/tasks/tests/fx_desktop_unittest.yml
testing/taskcluster/tasks/tests/fx_linux64_cppunit.yml
testing/taskcluster/tasks/tests/fx_linux64_cppunit_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_crashtest.yml
testing/taskcluster/tasks/tests/fx_linux64_crashtest_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_crashtest_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_crashtest_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_gtest.yml
testing/taskcluster/tasks/tests/fx_linux64_gtest_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_jittests.yml
testing/taskcluster/tasks/tests/fx_linux64_jittests_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_jsreftest.yml
testing/taskcluster/tasks/tests/fx_linux64_jsreftest_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_jsreftest_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_jsreftest_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_marionette.yml
testing/taskcluster/tasks/tests/fx_linux64_marionette_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_jetpack.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_jetpack_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest_not_accelerated.yml
testing/taskcluster/tasks/tests/fx_linux64_reftest_not_accelerated_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_dbg.yml
testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml
testing/taskcluster/tasks/tests/fx_linux64_xpcshell_dbg.yml
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -110,27 +110,27 @@ builds:
 tests:
   cppunit:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_cpp_unit.yml
       tasks/builds/b2g_emulator_x86_kk_debug.yml:
         task: tasks/tests/b2g_emulator_cpp_unit.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_cppunit.yml
+        task: tasks/tests/fx_linux64_cppunit_dbg.yml
   crashtest:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_crashtest.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_crashtest.yml
+        task: tasks/tests/fx_linux64_crashtest_dbg.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_crashtest_e10s.yml
+        task: tasks/tests/fx_linux64_crashtest_e10s_dbg.yml
   external-media-tests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_external_media_tests.yml
   firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional.yml
@@ -160,125 +160,125 @@ tests:
         task: tasks/tests/mulet_gaia_unit.yml
   gaia-unit-oop:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_gaia_unit_oop.yml
   gtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_gtest.yml
+        task: tasks/tests/fx_linux64_gtest_dbg.yml
   jittests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jittests.yml
+        task: tasks/tests/fx_linux64_jittests_dbg.yml
   jsreftest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jsreftest.yml
+        task: tasks/tests/fx_linux64_jsreftest_dbg.yml
   jsreftest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jsreftest_e10s.yml
+        task: tasks/tests/fx_linux64_jsreftest_e10s_dbg.yml
   marionette:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_marionette.yml
+        task: tasks/tests/fx_linux64_marionette_dbg.yml
   marionette-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_marionette_e10s.yml
+        task: tasks/tests/fx_linux64_marionette_e10s_dbg.yml
   marionette-webapi:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_marionette_webapi.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_mochitests.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_plain.yml
+        task: tasks/tests/fx_linux64_mochitest_plain_dbg.yml
   mochitest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_plain_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_plain_e10s_dbg.yml
   mochitest-a11y:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_a11y.yml
+        task: tasks/tests/fx_linux64_mochitest_a11y_dbg.yml
   mochitest-browser-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_bc.yml
+        task: tasks/tests/fx_linux64_mochitest_bc_dbg.yml
   mochitest-browser-chrome-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_bc_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_bc_e10s_dbg.yml
   mochitest-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_chrome.yml
+        task: tasks/tests/fx_linux64_mochitest_chrome_dbg.yml
   mochitest-devtools-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_dt.yml
+        task: tasks/tests/fx_linux64_mochitest_dt_dbg.yml
   mochitest-jetpack:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_jetpack.yml
+        task: tasks/tests/fx_linux64_mochitest_jetpack_dbg.yml
   mochitest-media:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_media.yml
+        task: tasks/tests/fx_linux64_mochitest_media_dbg.yml
   mochitest-media-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_media_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_media_e10s_dbg.yml
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_gl.yml
+        task: tasks/tests/fx_linux64_mochitest_gl_dbg.yml
   reftest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_reftests.yml
       tasks/builds/b2g_emulator_kk_opt.yml:
         task: tasks/tests/b2g_emulator_reftest.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_reftest.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_reftest.yml
+        task: tasks/tests/fx_linux64_reftest_dbg.yml
   reftest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_reftest_e10s.yml
+        task: tasks/tests/fx_linux64_reftest_e10s_dbg.yml
   web-platform-tests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_dbg.yml
   web-platform-tests-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_e10s.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_e10s_dbg.yml
   web-platform-tests-reftests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_reftests.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_reftests_dbg.yml
   web-platform-tests-reftests-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_dbg.yml
   xpcshell:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_xpcshell.yml
+        task: tasks/tests/fx_linux64_xpcshell_dbg.yml
 
 # Miscellaneous tasks.
 tasks:
   eslint-gecko:
     task: tasks/tests/eslint-gecko.yml
     root: true
     when:
       file_patterns:
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -132,135 +132,135 @@ post-build:
       - tasks/builds/dbg_linux64.yml
       - tasks/builds/android_api_15.yml
     task: tasks/post-builds/upload_symbols.yml
 
 tests:
   cppunit:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_cppunit.yml
+        task: tasks/tests/fx_linux64_cppunit_dbg.yml
   crashtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_crashtest.yml
+        task: tasks/tests/fx_linux64_crashtest_dbg.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_crashtest_e10s.yml
+        task: tasks/tests/fx_linux64_crashtest_e10s_dbg.yml
   external-media-tests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_external_media_tests.yml
   firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional.yml
   firefox-ui-functional-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
   gtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_gtest.yml
+        task: tasks/tests/fx_linux64_gtest_dbg.yml
   jittests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jittests.yml
+        task: tasks/tests/fx_linux64_jittests_dbg.yml
   jsreftest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jsreftest.yml
+        task: tasks/tests/fx_linux64_jsreftest_dbg.yml
   jsreftest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_jsreftest_e10s.yml
+        task: tasks/tests/fx_linux64_jsreftest_e10s_dbg.yml
   marionette:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_marionette.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_marionette.yml
+        task: tasks/tests/fx_linux64_marionette_dbg.yml
   marionette-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_marionette_e10s.yml
+        task: tasks/tests/fx_linux64_marionette_e10s_dbg.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_l_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_plain.yml
+        task: tasks/tests/fx_linux64_mochitest_plain_dbg.yml
   mochitest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_plain_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_plain_e10s_dbg.yml
   mochitest-a11y:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_a11y.yml
+        task: tasks/tests/fx_linux64_mochitest_a11y_dbg.yml
   mochitest-browser-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_bc.yml
+        task: tasks/tests/fx_linux64_mochitest_bc_dbg.yml
   mochitest-browser-chrome-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_bc_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_bc_e10s_dbg.yml
   mochitest-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_chrome.yml
+        task: tasks/tests/fx_linux64_mochitest_chrome_dbg.yml
   mochitest-devtools-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_dt.yml
+        task: tasks/tests/fx_linux64_mochitest_dt_dbg.yml
   mochitest-jetpack:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_jetpack.yml
+        task: tasks/tests/fx_linux64_mochitest_jetpack_dbg.yml
   mochitest-media:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_media.yml
+        task: tasks/tests/fx_linux64_mochitest_media_dbg.yml
   mochitest-media-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_media_e10s.yml
+        task: tasks/tests/fx_linux64_mochitest_media_e10s_dbg.yml
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_gl.yml
+        task: tasks/tests/fx_linux64_mochitest_gl_dbg.yml
   reftest:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_l_opt.yml:
         task: tasks/tests/b2g_emulator_reftest.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_reftest.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_reftest.yml
+        task: tasks/tests/fx_linux64_reftest_dbg.yml
   reftest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_reftest_e10s.yml
+        task: tasks/tests/fx_linux64_reftest_e10s_dbg.yml
   web-platform-tests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_dbg.yml
   web-platform-tests-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_e10s.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_e10s_dbg.yml
   web-platform-tests-reftests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_reftests.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_reftests_dbg.yml
   web-platform-tests-reftests-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
+        task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_dbg.yml
   xpcshell:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_xpcshell.yml
+        task: tasks/tests/fx_linux64_xpcshell_dbg.yml
deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/fx_desktop_unittest.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_test_base.yml'
-task:
-  payload:
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --no-read-buildbot-config
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
-      - --{{suite}}-suite={{flavor}}
-      - --total-chunk={{total_chunks}}
-      - --this-chunk={{chunk}}
-    env:
-        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
-        # TODO move linux_unittest.py to a platform specific config
-        MOZHARNESS_CONFIG: >
-          mozharness/configs/unittests/linux_unittest.py
-          mozharness/configs/remove_executables.py
--- a/testing/taskcluster/tasks/tests/fx_linux64_cppunit.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_cppunit.yml
@@ -2,17 +2,16 @@
 $inherits:
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --cppunittest-suite=cppunittest
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/unittests/linux_unittest.py
           mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 cppunit'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_cppunit_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_cppunit.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_crashtest.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_crashtest.yml
@@ -1,12 +1,26 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 crashtest'
     description: Crashtest run
   extra:
     suite:
       name: reftest
       flavor: crashtest
     treeherder:
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_crashtest_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_crashtest.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_crashtest_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_crashtest_e10s.yml
@@ -1,15 +1,27 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
       - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 crashtest e10s'
     description: Crashtest e10s run
   extra:
     suite:
       name: reftest
       flavor: crashtest
     treeherder:
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_crashtest_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_crashtest_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_gtest.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_gtest.yml
@@ -3,17 +3,16 @@
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --{{suite}}-suite={{flavor}}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/unittests/linux_unittest.py
           mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 gtest'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_gtest_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_gtest.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_jittests.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jittests.yml
@@ -1,12 +1,26 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 jittest-{{chunk}}'
     description: Jittests run {{chunk}}
   extra:
     chunks:
       total: 6
     suite:
       name: jittest
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jittests_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_jittests.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_jsreftest.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jsreftest.yml
@@ -1,12 +1,26 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 jsreftest'
     description: Jsreftest run {{chunk}}
   extra:
     chunks:
       total: 2
     suite:
       name: reftest
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jsreftest_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_jsreftest.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_jsreftest_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jsreftest_e10s.yml
@@ -1,15 +1,27 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
       - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 jsreftest e10s'
     description: Jsreftest e10s run
   extra:
     suite:
       name: reftest
       flavor: jsreftest
     treeherder:
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_jsreftest_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_jsreftest_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_marionette.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_marionette.yml
@@ -2,17 +2,16 @@
 $inherits:
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/marionette.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/marionette/prod_config.py
           mozharness/configs/remove_executables.py
     maxRunTime: 5400
   metadata:
     name: '[TC] Linux64 marionette'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_marionette_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_marionette.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml
@@ -2,17 +2,16 @@
 $inherits:
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --e10s
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/marionette.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/marionette/prod_config.py
           mozharness/configs/remove_executables.py
     maxRunTime: 5400
   metadata:
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_marionette_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml
@@ -1,20 +1,34 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-a11y'
     description: Mochitest a11y run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     suite:
       name: mochitest
       flavor: a11y
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: a11y
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_a11y.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc.yml
@@ -1,24 +1,36 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-browser-chrome-{{chunk}}'
     description: Mochitest browser-chrome run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     chunks:
       total: 7
     suite:
       name: mochitest
       flavor: browser-chrome-chunked
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: bc{{chunk}}
-
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_bc.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s.yml
@@ -1,26 +1,37 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
-    command:
-      - --e10s
     capabilities:
       devices:
         loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+      - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-browser-chrome-e10s-{{chunk}}'
     description: Mochitest browser-chrome e10s run {{chunk}}
   extra:
     chunks:
       total: 7
     suite:
       name: mochitest
       flavor: browser-chrome-chunked
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M-e10s
       symbol: bc{{chunk}}
-
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_bc_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml
@@ -1,20 +1,34 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-chrome-{{chunk}}'
     description: Mochitest chrome run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     chunks:
       total: 3
     suite:
       name: mochitest
       flavor: chrome
     treeherder:
       groupName: Desktop mochitests
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_chrome.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml
@@ -1,23 +1,36 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-  metadata:
-    name: '[TC] Linux64 mochitest-devtools-chrome-{{chunk}}'
-    description: Mochitest devtools-chrome run {{chunk}}
   payload:
     # these tests take longer than most to complete
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
+  scopes:
+    - 'docker-worker:capability:device:loopbackVideo'
+  metadata:
+    name: '[TC] Linux64 mochitest-devtools-chrome-{{chunk}}'
+    description: Mochitest devtools-chrome run {{chunk}}
   extra:
     chunks:
       total: 10
     suite:
       name: mochitest
       flavor: mochitest-devtools-chrome-chunked
     treeherder:
       groupName: Desktop mochitests
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_dt.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
@@ -1,20 +1,32 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     # these tests take longer than most to complete
     maxRunTime: 5400
-    command:
-      - --e10s
     capabilities:
       devices:
         loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+      - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-devtools-chrome-e10s-{{chunk}}'
     description: Mochitest devtools-chrome e10s run {{chunk}}
   extra:
     chunks:
       total: 10
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_dt_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl.yml
@@ -1,20 +1,34 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-gl'
     description: Mochitest webgl run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     suite:
       name: mochitest
       flavor: mochitest-gl
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: gl
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_gl.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_jetpack.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_jetpack.yml
@@ -1,21 +1,35 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    maxRunTime: 5400
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-jetpack'
     description: Mochitest jetpack run
-  payload:
-    maxRunTime: 5400
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     suite:
       name: mochitest
       flavor: jetpack-package
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: JP
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_jetpack_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_jetpack.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml
@@ -1,20 +1,34 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-media'
     description: Mochitest media run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     suite:
       name: mochitest
       flavor: mochitest-media
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: mda
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_media.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml
@@ -1,22 +1,35 @@
+---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+      - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-media-e10s'
     description: Mochitest media e10s run
-  payload:
-    command:
-      - --e10s
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     suite:
       name: mochitest
       flavor: mochitest-media
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M-e10s
       symbol: mda
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s_dbg.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_media_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml
@@ -1,22 +1,35 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    maxRunTime: 5400
+    capabilities:
+      devices:
+        loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-{{chunk}}'
     description: Mochitest plain run {{chunk}}
-  payload:
-    maxRunTime: 5400
-    capabilities:
-      devices:
-        loopbackVideo: true
   extra:
     chunks:
       total: 10
     suite:
       name: mochitest
       flavor: plain-chunked
     treeherder:
       groupName: Desktop mochitests
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_plain.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
@@ -1,19 +1,31 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
-    command:
-      - --e10s
     maxRunTime: 5400
     capabilities:
       devices:
         loopbackVideo: true
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+      - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
   metadata:
     name: '[TC] Linux64 mochitest-plain-e10s-{{chunk}}'
     description: Mochitest plain e10s run {{chunk}}
   extra:
     chunks:
       total: 10
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_mochitest_plain_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_reftest.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest.yml
@@ -1,17 +1,32 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 reftest-{{chunk}}'
     description: Reftest run {{chunk}}
   extra:
     chunks:
       total: 8
     suite:
       name: reftest
       flavor: reftest
     treeherder:
       groupName: Desktop reftest
       groupSymbol: tc-R
       symbol: R{{chunk}}
+
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_reftest.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s.yml
@@ -1,15 +1,27 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
       - --e10s
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 reftest-e10s-{{chunk}}'
     description: Reftest e10s run {{chunk}}
   extra:
     chunks:
       total: 5
     suite:
       name: reftest
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_reftest_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_reftest_not_accelerated.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_not_accelerated.yml
@@ -1,12 +1,26 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 reftest-{{chunk}}'
     description: Reftest not accelerated run {{chunk}}
   extra:
     chunks:
       total: 2
     suite:
       name: reftest
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_not_accelerated_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_reftest_not_accelerated.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests.yml
@@ -4,17 +4,16 @@
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --test-type=testharness
       - --total-chunk={{total_chunks}}
       - --this-chunk={{chunk}}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/web_platform_tests.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
           mozharness/configs/remove_executables.py
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_web_platform_tests.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
@@ -4,17 +4,16 @@
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --test-type=testharness
       - --e10s
       - --total-chunk={{total_chunks}}
       - --this-chunk={{chunk}}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/web_platform_tests.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_web_platform_tests_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests.yml
@@ -4,17 +4,16 @@
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 5400
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --test-type=reftest
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/web_platform_tests.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
           mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 web-platform-tests-reftests'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_web_platform_tests_reftests.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml
@@ -3,17 +3,16 @@
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     maxRunTime: 5400
     command:
       - --no-read-buildbot-config
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=true # This value is to be ondemand for opt jobs
       - --test-type=reftest
       - --e10s
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/web_platform_tests.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
           mozharness/configs/remove_executables.py
   metadata:
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_web_platform_tests_reftests_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
--- a/testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml
@@ -1,12 +1,26 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
+  from: 'tasks/tests/fx_desktop_generic.yml'
 task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --{{suite}}-suite={{flavor}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+        # TODO move linux_unittest.py to a platform specific config
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/unittests/linux_unittest.py
+          mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 xpcshell-{{chunk}}'
     description: XPCShell run {{chunk}}
   extra:
     chunks:
       total: 5
     suite:
       name: xpcshell
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_xpcshell_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_xpcshell.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true