Backed out changeset 0a779fd6fdd9 (bug 1724943) for causing perfdocs linting failures.

CLOSED TREE

taskcluster/ci/test/browsertime-desktop.yml

@@ -5,8 +5,8 @@
 job-defaults:
     max-run-time:
         by-test-platform:
-            .*-ref-hw-2017-qr/.*: 3600
             .*-qr/.*: 2400
+            .*-ref-hw-2017/.*: 3600
             default: 1800
     suite: raptor
     run-on-projects:
@@ -161,7 +161,7 @@ browsertime-tp6-essential:
             default: []
     tier:
         by-test-platform:
-            linux1804-64-clang-trunk-qr/opt: 2
+            linux1804-64-clang-trunk/opt: 2
             default:
                 by-app:
                     firefox: 1
@@ -191,7 +191,7 @@ browsertime-benchmark:
                         by-subtest:
                             motionmark-animometer:
                                 by-test-platform:
-                                    linux1804-64-clang-trunk-qr/opt: 2
+                                    linux1804-64-clang-trunk/opt: 2
                                     default: 1
                             unity-webgl: 3
                             default:
@@ -282,6 +282,7 @@ browsertime-benchmark:
             assorted-dom:
                 by-test-platform:
                     .*-qr/.*: 2100
+                    .*-ref-hw-2017/.*: 2100
                     default: 1500
             jetstream2: 8000
             motionmark-htmlsuite: 1500
@@ -367,7 +368,7 @@ browsertime-youtube-playback:
     limit-platforms:
         by-subtest:
             youtube-playback-av1-sfr:
-                - windows10-64-ref-hw-2017-qr/opt
+                - windows10-64-ref-hw-2017/opt
                 - macosx1015-64-shippable-qr/opt
             # Bug 1718630
             youtube-playback.*widevine.*:

taskcluster/ci/test/raptor.yml

@@ -7,8 +7,8 @@ job-defaults:
         by-app:
             firefox:
                 by-test-platform:
-                    .*-ref-hw-2017-qr/.*: 3600
                     .*-qr/.*: 2400
+                    .*-ref-hw-2017/.*: 3600
                     default: 1800
             default:
                 by-test-platform:
@@ -119,7 +119,7 @@ raptor-youtube-playback-av1-sfr-firefox:
                     (linux|windows.*64|macos)(?!.*-qr).*: []
                     default: [mozilla-central]
     limit-platforms:
-        - windows10-64-ref-hw-2017-qr/opt
+        - windows10-64-ref-hw-2017/opt
         - macosx1015-64-shippable-qr/opt
     max-run-time:
         by-test-platform:

taskcluster/ci/test/test-platforms.yml

@@ -109,7 +109,7 @@ linux1804-64-devedition-qr/opt:
         - linux1804-tests
         - web-platform-tests
 
-linux1804-64-clang-trunk-qr/opt:
+linux1804-64-clang-trunk/opt:
     build-platform: linux64-plain-clang-trunk/opt
     test-sets:
         - awsy
@@ -198,7 +198,7 @@ windows10-aarch64-qr/opt:
     test-sets:
         - windows-aarch64-tests
 
-windows10-64-ref-hw-2017-qr/opt:
+windows10-64-ref-hw-2017/opt:
     build-platform: win64-shippable/opt
     test-sets:
         - raptor-firefox
@@ -307,6 +307,13 @@ macosx1100-64-shippable-qr/opt:
         # - browsertime-high-priority
         # - raptor-firefox
 
+macosx1015-64-shippable/opt:
+    build-platform: macosx64-shippable/opt
+    test-sets:
+        - awsy
+        - browsertime
+        - macosx64-talos
+
 macosx1015-64-shippable-qr/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
@@ -324,6 +331,16 @@ macosx1015-64-shippable-qr/opt:
         - web-platform-tests-backlog
         - web-platform-tests-wdspec-headless
 
+macosx1015-64/debug:
+    build-platform: macosx64/debug
+    test-sets:
+        - macosx1015-64-tests
+
+macosx1015-64-devedition/opt:
+    build-platform: macosx64-devedition/opt
+    test-sets:
+        - macosx1015-64-tests
+
 macosx1015-64-devedition-qr/opt:
     build-platform: macosx64-devedition/opt
     test-sets:

taskcluster/ci/test/test-sets.yml

@@ -383,6 +383,10 @@ macosx1015-64-qr-tests:
     - test-verify-wpt
     - xpcshell
 
+# debug only
+macosx1015-64-tests:
+    - web-platform-tests-reftest
+
 macosx64-talos:
     - talos-bcv
     - talos-chrome

taskcluster/taskgraph/target_tasks.py

@@ -993,9 +993,9 @@ def target_tasks_build_linux64_clang_trunk_perf(
 ):
     """Select tasks required to run perf test on linux64 build with clang trunk"""
 
-    # Only keep tasks generated from platform `linux1804-64-clang-trunk-qr/opt`
+    # Only keep tasks generated from platform `linux1804-64-clang-trunk/opt`
     def filter(task_label):
-        if "linux1804-64-clang-trunk-qr/opt" in task_label:
+        if "linux1804-64-clang-trunk/opt" in task_label:
             return True
         return False