Backed out changeset 3417336ac329 (bug 1733684) for causing windows startup failures and blocking nightlies. a=backout

python/mozperftest/mozperftest/test/browsertime/visualtools.py

@@ -95,10 +95,6 @@ NUMPY = {
         "69/89/d8fc61a51ded540bd4b8859510b4ae44a0762c8b61dd81eb2c36f5e853ef/"
         "numpy-1.19.2-cp38-cp38-win_amd64.whl"
     ),
-    ("win64", "3.9"): (
-        "cc/bd/5779abe299afb562cdd434e8229a69a71802cc131ea6d811a8bf05937745/"
-        "numpy-1.20.0-cp39-cp39-win_amd64.whl"
-    ),
 }
 
 
@@ -139,10 +135,6 @@ SCIPY = {
         "9e/66/57d6cfa52dacd9a57d0289f8b8a614b2b4f9c401c2ac154d6b31ed8257d6/"
         "numpy-1.19.2-cp38-cp38-win_amd64.whl"
     ),
-    ("win64", "3.9"): (
-        "a5/6c/30c838130f75f3aaf65fdf72cc357967d7d2b569bf52c7eb788e6f1eb8c3/"
-        "scipy-1.5.4-cp39-cp39-win_amd64.whl"
-    ),
 }
 
 

taskcluster/ci/config.yml

@@ -587,7 +587,7 @@ workers:
             implementation: generic-worker
             os: windows
             worker-type: 'gecko-{alias}'
-        win10-64-2004(|-gpu|-source):
+        win10-64-2004(|-gpu):
             provisioner: 'gecko-t'
             implementation: generic-worker
             os: windows

taskcluster/ci/source-test/python.yml

@@ -12,7 +12,7 @@ job-defaults:
         by-platform:
             linux1804-64.*: t-linux-xlarge-source
             macosx1015-64.*: t-osx-1015-r8
-            windows10-64.*: win10-64-2004-source
+            windows10-64.*: t-win10-64-source
     worker:
         by-platform:
             linux1804-64.*:

taskcluster/ci/startup-test/kind.yml

@@ -101,7 +101,7 @@ jobs:
             upstream_kind: repackage-signing
             upstream_artifact: target.installer.exe
             binary: core/firefox.exe
-        worker-type: win10-64-2004-source
+        worker-type: t-win10-64-source
         shipping-product: firefox
         attributes:
             build_platform: win32-shippable
@@ -118,7 +118,7 @@ jobs:
             upstream_kind: repackage-signing
             upstream_artifact: target.installer.exe
             binary: core/firefox.exe
-        worker-type: win10-64-2004-source
+        worker-type: t-win10-64-source
         shipping-product: firefox
         attributes:
             build_platform: win64-shippable