From cb0d9f9ca1712b2574fee49e580d5a0b186d6979 Mon Sep 17 00:00:00 2001
From: Michelle Goossens <michelle@masterwayz.nl>
Date: Sun, 29 Aug 2021 15:02:56 +0000
Subject: [PATCH] Bug 1727943 - Part 1: Migrate Windows 10 ccov from AWS to
 Azure r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D123865
---
 taskcluster/ci/test/test-platforms.yml | 11 ++++++-----
 taskcluster/ci/test/test-sets.yml      | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index eac2cabffa30..5f140c536200 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -180,11 +180,7 @@ windows10-32-2004-qr/debug:
 windows10-64-ccov-qr/opt:
     build-platform: win64-ccov/opt
     test-sets:
-        - desktop-screenshot-capture
-        - windows-ccov-tests
-        - ccov-code-coverage-tests
-        - windows10-2004-tests  # For Bug 1723531
-        - web-platform-tests  # For Bug 1723531
+        - windows10-64-ccov-tests  # For Bug 1723531 but without what has been migrated in Bug X so far
 
 windows10-64-qr/opt:
     build-platform: win64/opt
@@ -234,6 +230,11 @@ windows10-32-mingwclang-qr/opt:
         - mingwclang-tests-opt
 
 # win10-64 2004
+windows10-64-2004-ccov-qr/opt:
+    build-platform: win64-ccov/opt
+    test-sets:
+        - windows10-64-2004-ccov-tests
+
 windows10-64-2004-qr/debug:
     build-platform: win64/debug
     test-sets:
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 233ab968cdca..90e2e1aad899 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -262,6 +262,29 @@ windows10-2004-tests:
     - test-verify-wpt
     - xpcshell
 
+windows10-64-ccov-tests:
+    - jittest
+    - mochitest-plain
+    - mochitest-browser-chrome
+    - mochitest-devtools-chrome
+    - web-platform-tests
+    - web-platform-tests-reftest
+    - web-platform-tests-wdspec
+    - crashtest
+    - reftest
+    - xpcshell
+
+windows10-64-2004-ccov-tests:
+    - gtest
+    - marionette
+    - test-coverage
+    - test-verify
+    - test-verify-gpu
+    - cppunit
+    - jsreftest
+    - web-platform-tests-crashtest
+    - web-platform-tests-print-reftest
+
 windows10-64-2004-failure-tests:
     - mochitest-browser-chrome-failures