Bug 1816943 - switch win7 workers over to azure. r=gbrown, a=dmeehan

Differential Revision: https://phabricator.services.mozilla.com/D169936
mimikun · Feb 16, 2023 · b78b4cd · b78b4cd
1 parent 8e0b3a2
commit b78b4cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
@@ -644,11 +644,16 @@ workers:
             implementation: generic-worker
             os: windows
             worker-type: '{alias}'
-        t-win7-32(|-gpu):
+        t-win7-32-gpu:
             provisioner: '{trust-domain}-t'
             implementation: generic-worker
             os: windows
             worker-type: '{alias}'
+        t-win7-32:
+            provisioner: releng-hardware
+            implementation: generic-worker
+            os: windows
+            worker-type: 'gecko-{alias}-hw'
         t-win64-aarch64-laptop:
             provisioner: bitbar
             implementation: generic-worker

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
@@ -176,7 +176,6 @@ windows-7-tests:
     - mochitest-browser-a11y
     - mochitest-browser-chrome
     - mochitest-webgpu
-    - reftest
     - xpcshell
 
 windows32-2004-tests:
@@ -193,6 +192,7 @@ windows32-2004-tests:
     - mochitest-plain
     - mochitest-plain-gpu
     - mochitest-remote
+    - reftest
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu

diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
@@ -59,6 +59,8 @@
 
 # benchmarking on tbpl revealed that this works best for now
 NUM_THREADS = int(cpu_count() * 4)
+if sys.platform == "win32":
+    NUM_THREADS = NUM_THREADS / 2
 
 EXPECTED_LOG_ACTIONS = set(
     [