Bug 1675739 - Disable macos raptor chrome/chromium tests. r=perftest-…

…reviewers,Bebe Differential Revision: https://phabricator.services.mozilla.com/D96316
dothq · Nov 9, 2020 · 6dc8842 · 6dc8842
1 parent d14f34a
commit 6dc8842
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/taskcluster/ci/test/browsertime-desktop.yml b/taskcluster/ci/test/browsertime-desktop.yml
@@ -108,7 +108,7 @@ browsertime-tp6:
         by-app:
             chrome:
                 - linux.*shippable[^-qr].*
-                - mac.*shippable[^-qr].*
+                - macosx1014-64-shippable-qr/opt
             chromium:
                 # Run on non-QR shippable, but test-platforms.yml doesn't have
                 # any more non-QR macosx shippable things. So for macosx we want

diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
@@ -867,11 +867,11 @@ def _run_live_site():
             # Select some browsertime tasks as desktop smoke-tests
             if "browsertime" in try_name:
                 if "chrome" in try_name:
-                    if "linux" in platform:
+                    if "linux" in platform or "macos" in platform:
                         return True
                     return False
                 if "chromium" in try_name:
-                    if "linux" in platform:
+                    if "linux" in platform or "macos" in platform:
                         return True
                     return False
                 if "-fis" in try_name:
@@ -883,7 +883,7 @@ def _run_live_site():
                         return True
             else:
                 # Run tests on all chrome variants
-                if "linux" in platform and "tp6" in try_name:
+                if ("linux" in platform or "macos" in platform) and "tp6" in try_name:
                     return False
                 if "-chrome" in try_name:
                     return True

diff --git a/testing/raptor/raptor/cmdline.py b/testing/raptor/raptor/cmdline.py
@@ -490,7 +490,16 @@ def verify_options(parser, args):
 
     # if --enable-webrender specified, must be on desktop firefox or geckoview-based browser.
     if args.enable_webrender:
-        if args.app not in ["firefox", "geckoview", "refbrow", "fenix"]:
+        if (
+            args.app
+            not in [
+                "firefox",
+                "geckoview",
+                "refbrow",
+                "fenix",
+            ]
+            and platform.system().lower() not in ("darwin",)
+        ):
             parser.error(
                 "WebRender is only supported when running Raptor on Firefox Desktop "
                 "or GeckoView-based Android browsers!"