From ed422e8561188617fe7449c0242df7914327a556 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Sat, 18 Nov 2017 00:05:51 +0100
Subject: [PATCH] Bug 1418252 - Make talos tests run in Windows coverage build.
 r=jmaher

--HG--
extra : rebase_source : 8bcfc4112938de91b22497d48482d80eba3ff88c
---
 taskcluster/ci/test/talos.yml             | 9 ++++++++-
 taskcluster/taskgraph/transforms/tests.py | 9 ++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml
index 2b1079113e22..53fad2bf45d6 100644
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -1,7 +1,10 @@
 job-defaults:
     max-run-time: 3600
     suite: talos
-    virtualization: hardware
+    virtualization:
+        by-test-platform:
+            windows10-64-ccov/.*: virtual
+            default: hardware
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
@@ -11,6 +14,10 @@ job-defaults:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
+                windows10-64-ccov/debug:
+                    - talos/windows_vm_config.py
+                linux64-ccov/opt:
+                    - talos/linux64_config_taskcluster.py
                 default:
                     - talos/linux_config.py
 
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index b145b2d7b425..76877ed4bf1f 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -675,11 +675,10 @@ def enable_code_coverage(config, tests):
                     test['run-on-projects'] == 'built-projects':
                 test['run-on-projects'] = ['mozilla-central', 'try']
 
-            # TODO: Fix talos on Windows coverage build.
-            if test['test-name'].startswith('talos'):
+            if 'talos' in test['test-name']:
                 test['max-run-time'] = 7200
-                test['docker-image'] = {"in-tree": "desktop1604-test"}
-                test['mozharness']['config'] = ['talos/linux64_config_taskcluster.py']
+                if 'linux' in test['build-platform']:
+                    test['docker-image'] = {"in-tree": "desktop1604-test"}
                 test['mozharness']['extra-options'].append('--add-option')
                 test['mozharness']['extra-options'].append('--cycles,1')
                 test['mozharness']['extra-options'].append('--add-option')
@@ -886,7 +885,7 @@ def set_worker_type(config, tests):
             win_worker_type_platform = WINDOWS_WORKER_TYPES[
                 test_platform.split('/')[0]
             ]
-            if test.get('suite', '') == 'talos':
+            if test.get('suite', '') == 'talos' and 'ccov' not in test['build-platform']:
                 if try_options.get('taskcluster_worker'):
                     test['worker-type'] = win_worker_type_platform['hardware']
                 else: