From 5a3003050d61284f9ecb2d04af1b8346e72bbbda Mon Sep 17 00:00:00 2001
From: Rob Lemley <rob@thunderbird.net>
Date: Wed, 16 Jan 2019 20:56:17 +0000
Subject: [PATCH] Bug 1517298 - TB Mochhitest configuration for taskcluster.
 r=darktrojan

Adds the necessary taskcluster and mozharness configuration for Thunderbird
Mochitests.
Note that the addition of "all_mochitest_suites" in thunderbird_extra.py will
replace the inherited list of mochitests from "*_taskcluster_unittest.py".

Differential Revision: https://phabricator.services.mozilla.com/D16376

--HG--
extra : moz-landing-system : lando
---
 mozharness/unittests/thunderbird_extra.py |  4 ++++
 taskcluster/ci/config.yml                 |  4 ++++
 taskcluster/ci/test/kind.yml              |  2 ++
 taskcluster/ci/test/test-sets.yml         |  1 +
 taskcluster/ci/test/tests.yml             | 27 +++++++++++++++++++++++
 5 files changed, 38 insertions(+)

diff --git a/mozharness/unittests/thunderbird_extra.py b/mozharness/unittests/thunderbird_extra.py
index 25feaf29b5..b2d5697564 100644
--- a/mozharness/unittests/thunderbird_extra.py
+++ b/mozharness/unittests/thunderbird_extra.py
@@ -18,4 +18,8 @@ config = {
     "all_mozmill_suites": {
         "mozmill": ["--list=tests/mozmill/mozmilltests.list"],
     },
+    "all_mochitest_suites": {
+        "browser-chrome-thunderbird": ["--flavor=browser",
+                                       "--subsuite=thunderbird"],
+    },
 }
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 9a27bd8ce4..95aa02b866 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -18,6 +18,10 @@ treeherder:
         'Fetch-URL': 'Fetch and store content'
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'
+        'M': 'Mochitests'
+        'M-sw': 'Mochitests with serviceworker redesign'
+        'M-e10s': 'Mochitests with e10s'
+        'M-sw-e10s': 'Mochitests with serviceworker redesign and e10s'
         'ms': 'Complete MAR signing'
         'MSI': 'Repack installers into MSIs'
         'MSIs': 'Signing of Repacked installers of MSIs'
diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
index b3678479ed..a0705daf58 100644
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -7,6 +7,8 @@ loader: taskgraph.loader.test:loader
 kind-dependencies:
     - build
     - build-signing
+    - fetch
+    - toolchain
 
 transforms:
     - taskgraph.transforms.tests:transforms
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 717f9c161c..40be5af8b1 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -18,3 +18,4 @@
 common-tests:
     - xpcshell
     - mozmill
+    - mochitest-thunderbird
diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
index 7447e7811d..6af138ff34 100644
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -105,3 +105,30 @@ mozmill:
         extra-options:
             - "--mozmill-suite=mozmill"
         requires-signed-builds: false
+
+mochitest-thunderbird:
+    description: "Mochitest browser-chrome-thunderbird run"
+    suite: mochitest/browser-chrome-thunderbird
+    treeherder-symbol: M(bct)
+    run-on-projects: []  # Don't run during testing phase
+    loopback-video: true
+    max-run-time: 3600
+    e10s: true
+    serviceworker-e10s: false
+    mozharness:
+        script: desktop_unittest.py
+        mochitest-flavor: browser
+        config:
+            by-test-platform:
+                windows.*:
+                    - unittests/win_taskcluster_unittest.py
+                    - unittests/thunderbird_extra.py
+                macosx64.*:
+                    - unittests/mac_unittest.py
+                    - unittests/thunderbird_extra.py
+                linux.*:
+                    - unittests/linux_unittest.py
+                    - remove_executables.py
+                    - unittests/thunderbird_extra.py
+    instance-size: default
+    allow-software-gl-layers: false