Bug 1244720 - Modifications to tier 2 TaskCluster jobs. DONTBUILD. r=jmaher

* add Jetpack definition
* e10s mochitests were not using --e10s flag [1]
* disable mochitest e10s since they're not green anymore
* increase Marionette max runtime

[1]
Unfortunately, we had two payload entries defined for e10s mochitests.
That would cause the first paylod (with --e10s) to be ignored.

--HG--
extra : commitid : 7ehiRqgLNLH
extra : rebase_source : 25d0bf063a6591b842aa0410e00a3a6f0a9216f7

testing/taskcluster/tasks/branches/base_jobs.yml

@@ -238,10 +238,6 @@ tests:
         task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_plain.yml
-  mochitest-e10s:
-    allowed_build_tasks:
-      tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_plain_e10s.yml
   mochitest-a11y:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:

testing/taskcluster/tasks/tests/fx_linux64_jetpack.yml

@@ -0,0 +1,23 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_desktop_unittest.yml'
+task:
+  scopes:
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
+  metadata:
+    name: '[TC] Linux64 jetpack'
+    description: Mochitest jetpack
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
+  extra:
+    suite:
+      name: mochitest
+      flavor: jetpack-package
+    treeherder:
+      groupName: Desktop mochitests
+      groupSymbol: tc-M
+      symbol: JP

testing/taskcluster/tasks/tests/fx_linux64_marionette.yml

@@ -13,6 +13,7 @@ task:
         MOZHARNESS_CONFIG: >
           mozharness/configs/marionette/prod_config.py
           mozharness/configs/remove_executables.py
+    maxRunTime: 5400
   metadata:
     name: '[TC] Linux64 marionette'
     description: Marionette unittest run

testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc_e10s.yml

@@ -5,17 +5,16 @@ task:
   payload:
     command:
       - --e10s
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   metadata:
     name: '[TC] Linux64 mochitest-browser-chrome e10s M(bc{{chunk}})'
     description: Mochitest browser-chrome e10s run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
   extra:
     chunks:
       total: 7

testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml

@@ -5,17 +5,16 @@ task:
   payload:
     command:
       - --e10s
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   metadata:
     name: '[TC] Linux64 mochitest-devtools-chrome e10s M(dt{{chunk}})'
     description: Mochitest devtools-chrome e10s run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
   extra:
     chunks:
       total: 10

testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml

@@ -5,18 +5,17 @@ task:
   payload:
     command:
       - --e10s
+    maxRunTime: 5400
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:capability:device:loopbackAudio'
   metadata:
     name: '[TC] Linux64 mochitest-plain e10s {{chunk}}'
     description: Mochitest plain e10s run {{chunk}}
-  payload:
-    maxRunTime: 5400
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
   extra:
     chunks:
       total: 10

testing/taskcluster/tasks/tests/fx_test_base.yml

@@ -22,6 +22,7 @@ task:
       allowPtrace: true
   extra:
     treeherder:
+      groupName: Desktop tests
       tier: 2
     treeherderEnv:
       - production