Run a reduced Mac blink web/wpt test set on Mac10.15 CI builders

Blink web/wpt test frequent timeout on older mac builders. We will only run a subset of web/wpt tests on Mac10.15 that are different from those run on newer version of Mac builders. Bug: 1481304 Cq-Include-Trybots: luci.chromium.try:mac10.15-blink-rel Change-Id: Ib61c9c00df4861757f7c1556900ed471fc68b472 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4967713 Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org> Reviewed-by: Sven Zheng <svenzheng@chromium.org> Reviewed-by: Lindsay Pasricha <lindsayw@chromium.org> Commit-Queue: Vivian Zhi <vivianz@google.com> Reviewed-by: Weizhong Xia <weizhong@google.com> Reviewed-by: Mark Mentovai <mark@chromium.org> Cr-Commit-Position: refs/heads/main@{#1216307}
chromium · Oct 27, 2023 · 44d8b61 · 44d8b61
1 parent 1a5d2a7
commit 44d8b61
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 1,929 deletions.
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -1253,8 +1253,7 @@
             "cpu": "x86-64",
             "os": "Mac-10.15"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 10
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "blink_web_tests",
         "test_id_prefix": "ninja://:blink_web_tests/"
@@ -1281,8 +1280,7 @@
             "cpu": "x86-64",
             "os": "Mac-10.15"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 15
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "blink_wpt_tests",
         "test_id_prefix": "ninja://:blink_wpt_tests/"

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
@@ -336,7 +336,7 @@
           'dimensions': {
             'gpu': None,
           },
-          'shards': 10,
+          'shards': 1,
         },
       },
       'Mac11 Tests': {
@@ -582,7 +582,7 @@
       },
       'mac10.15-blink-rel': {
         'swarming': {
-          'shards': 8,
+          'shards': 1,
           'hard_timeout': 2400,
         },
       },
@@ -683,7 +683,7 @@
           'dimensions': {
             'gpu': None,
           },
-          'shards': 15,
+          'shards': 1,
         },
       },
       'Mac11 Tests': {

diff --git a/testing/buildbot/tryserver.blink.json b/testing/buildbot/tryserver.blink.json
@@ -255,8 +255,7 @@
             "os": "Mac-10.15"
           },
           "hard_timeout": 2400,
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 8
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "blink_web_tests",
         "test_id_prefix": "ninja://:blink_web_tests/"

diff --git a/third_party/blink/tools/blinkpy/web_tests/port/mac.py b/third_party/blink/tools/blinkpy/web_tests/port/mac.py
@@ -119,3 +119,13 @@ def path_to_driver(self, target=None):
                                'MacOS',
                                self.driver_name(),
                                target=target)
+
+    def default_smoke_test_only(self):
+        # only run platform specific tests on Mac 10.15
+        if self.host.platform.os_version == 'mac10.15':
+           return True
+        return False
+
+    def path_to_smoke_tests_file(self):
+        return self._filesystem.join(self.web_tests_dir(), 'TestLists',
+                                     'MacOld.txt')