Bug 1593598 - Investigate failures of browsertime speedometer test on Windows r=perftest-reviewers,rwood

Differential Revision: https://phabricator.services.mozilla.com/D54183

--HG--
extra : moz-landing-system : lando

testing/raptor/raptor/benchmark.py

@@ -41,11 +41,12 @@ class Benchmark(object):
             # Some benchmarks may have been downloaded from a fetch task, make
             # sure they get copied over.
             fetches_dir = os.environ.get('MOZ_FETCHES_DIR')
-            if fetches_dir and os.path.isdir(fetches_dir):
+            if test.get('fetch_task', False) and fetches_dir and os.path.isdir(fetches_dir):
                 for name in os.listdir(fetches_dir):
-                    path = os.path.join(fetches_dir, name)
-                    if os.path.isdir(path):
-                        shutil.copytree(path, os.path.join(self.bench_dir, name))
+                    if test.get('fetch_task') in name:
+                        path = os.path.join(fetches_dir, name)
+                        if os.path.isdir(path):
+                            shutil.copytree(path, os.path.join(self.bench_dir, name))
 
         LOG.info("bench_dir contains:")
         LOG.info(os.listdir(self.bench_dir))

testing/raptor/raptor/tests/benchmarks/raptor-assorted-dom.ini

@@ -8,6 +8,7 @@ lower_is_better = true
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 2000000
+fetch_task = assorted-dom
 
 [raptor-assorted-dom-firefox]
 apps = firefox

testing/raptor/raptor/tests/benchmarks/raptor-jetstream2.ini

@@ -16,6 +16,7 @@ subtest_lower_is_better = true
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 14000000
+fetch_task = jetstream2
 
 
 [raptor-jetstream2-firefox]

testing/raptor/raptor/tests/benchmarks/raptor-unity-webgl.ini

@@ -8,6 +8,7 @@ lower_is_better = false
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 8000000
+fetch_task = unity-webgl
 
 [raptor-unity-webgl-firefox]
 apps = firefox

testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-baseline.ini

@@ -14,6 +14,7 @@ lower_is_better = true
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 4000000
+fetch_task = wasm-misc
 
 [raptor-wasm-misc-baseline-firefox]
 apps = firefox

testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-cranelift.ini

@@ -12,6 +12,7 @@ page_timeout = 1200000
 unit = ms
 lower_is_better = true
 alert_threshold = 2.0
+fetch_task = wasm-misc
 
 [raptor-wasm-misc-cranelift-firefox]
 apps = firefox

testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-ion.ini

@@ -14,6 +14,7 @@ lower_is_better = true
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 4000000
+fetch_task = wasm-misc
 
 [raptor-wasm-misc-ion-firefox]
 apps = firefox

testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc.ini

@@ -14,6 +14,7 @@ lower_is_better = true
 alert_threshold = 2.0
 gecko_profile_interval = 1
 gecko_profile_entries = 4000000
+fetch_task = wasm-misc
 
 [raptor-wasm-misc-firefox]
 apps = firefox