From 8a15b54b152a1f8076c0ca17931ca6b9f0bf6f95 Mon Sep 17 00:00:00 2001
From: Michelle Goossens <michelle@masterwayz.nl>
Date: Wed, 27 Oct 2021 11:33:17 +0000
Subject: [PATCH] Bug 1733684 - Move the win10-64-source jobs over to the new
 Win10 2004 Azure workers r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D128295
---
 .../mozperftest/test/browsertime/visualtools.py   |  8 ++++++++
 taskcluster/ci/config.yml                         |  2 +-
 taskcluster/ci/source-test/python.yml             |  2 +-
 taskcluster/ci/startup-test/kind.yml              |  6 +++---
 testing/mozharness/scripts/does_it_crash.py       | 15 ++++++++++++++-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/python/mozperftest/mozperftest/test/browsertime/visualtools.py b/python/mozperftest/mozperftest/test/browsertime/visualtools.py
index 91e773573583..066265047e14 100644
--- a/python/mozperftest/mozperftest/test/browsertime/visualtools.py
+++ b/python/mozperftest/mozperftest/test/browsertime/visualtools.py
@@ -95,6 +95,10 @@ 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"
+    ),
 }
 
 
@@ -135,6 +139,10 @@ 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"
+    ),
 }
 
 
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 9f2cdd96767f..639dec8aa65a 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -588,7 +588,7 @@ workers:
             implementation: generic-worker
             os: windows
             worker-type: 'gecko-{alias}'
-        win10-64-2004(|-gpu|-ssd):
+        win10-64-2004(|-gpu|-ssd|-source):
             provisioner: 'gecko-t'
             implementation: generic-worker
             os: windows
diff --git a/taskcluster/ci/source-test/python.yml b/taskcluster/ci/source-test/python.yml
index d45c78eef471..36f3e987f8c3 100644
--- a/taskcluster/ci/source-test/python.yml
+++ b/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.*: t-win10-64-source
+            windows10-64.*: win10-64-2004-source
     worker:
         by-platform:
             linux1804-64.*:
diff --git a/taskcluster/ci/startup-test/kind.yml b/taskcluster/ci/startup-test/kind.yml
index db883ab730d4..5d3f7114ed63 100644
--- a/taskcluster/ci/startup-test/kind.yml
+++ b/taskcluster/ci/startup-test/kind.yml
@@ -25,7 +25,7 @@ job-defaults:
     description: Check whether or not a product crashes on startup
     run-on-projects: ['mozilla-central']
     worker:
-        max-run-time: 1200
+        max-run-time: 3600
     run:
         sparse-profile: mozharness
     attributes:
@@ -101,7 +101,7 @@ jobs:
             upstream_kind: repackage-signing
             upstream_artifact: target.installer.exe
             binary: core/firefox.exe
-        worker-type: t-win10-64-source
+        worker-type: win10-64-2004-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: t-win10-64-source
+        worker-type: win10-64-2004-source
         shipping-product: firefox
         attributes:
             build_platform: win64-shippable
diff --git a/testing/mozharness/scripts/does_it_crash.py b/testing/mozharness/scripts/does_it_crash.py
index b918c2b96486..d554a35b4ae7 100755
--- a/testing/mozharness/scripts/does_it_crash.py
+++ b/testing/mozharness/scripts/does_it_crash.py
@@ -11,6 +11,7 @@
 from __future__ import absolute_import
 import os
 import sys
+import requests
 
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
@@ -83,10 +84,22 @@ class DoesItCrash(BaseScript):
             config_options=self.config_options,
         )
 
+    def downloadFile(self, url, file_name):
+        req = requests.get(url, stream=True, timeout=30)
+        file_path = os.path.join(os.getcwd(), file_name)
+
+        with open(file_path, "wb") as f:
+            for chunk in req.iter_content(chunk_size=1024):
+                if not chunk:
+                    continue
+                f.write(chunk)
+                f.flush()
+        return file_path
+
     def download(self):
         url = self.config["thing_url"]
         fn = "thing." + url.split(".")[-1]
-        self.download_file(self.config["thing_url"], file_name=fn)
+        self.downloadFile(url=url, file_name=fn)
         if mozinstall.is_installer(fn):
             self.install_dir = mozinstall.install(fn, "thing")
         else: