Bug 1330412 - Schedule Linux Stylo Talos like others. r=jmaher
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 31 Aug 2017 12:10:48 -0500
changeset 428530 d6c23b724e867fceb83a036f636beafe1817007f
parent 428529 ca968311ed00864d19bb652f2086701eed4d8679
child 428531 76e1adb5416db7c07f08d15e262cd092b9409e6d
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1330412
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1330412 - Schedule Linux Stylo Talos like others. r=jmaher Make Linux Stylo Talos jobs explicit in the task list, like they are for macOS and Windows. This way we avoid have different approaches per platform. (This is still the Stylo enabled form. The next patch coverts to Stylo disabled for all platforms.) MozReview-Commit-ID: K4CcWvR9tlJ
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/ci/test/tests.yml
testing/talos/talos.json
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -17,44 +17,45 @@
 
 linux32/debug:
     build-platform: linux/debug
     test-sets:
         - linux32-tests
 linux32/opt:
     build-platform: linux/opt
     test-sets:
-        -  linux32-tests
-        -  linux32-opt-tests
+        - linux32-tests
+        - linux32-opt-tests
 linux32-nightly/opt:
     build-platform: linux-nightly/opt
     test-sets:
-        -  linux32-tests
-        -  linux32-opt-tests
+        - linux32-tests
+        - linux32-opt-tests
 linux32-devedition/opt:
     build-platform: linux-devedition-nightly/opt
     test-sets:
-        -  linux32-tests
-        -  linux32-opt-tests
+        - linux32-tests
+        - linux32-opt-tests
 
 linux64/debug:
     build-platform: linux64/debug
     test-sets:
         - common-tests
         - web-platform-tests
         - reftest-stylo
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - reftest-stylo
         - desktop-screenshot-capture
         - talos
+        - linux-talos-stylo
         - awsy
 linux64-nightly/opt:
     build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
@@ -69,16 +70,17 @@ linux64-devedition/opt:
 
 # TODO: use 'pgo' and 'asan' labels here, instead of -pgo/opt
 linux64-pgo/opt:
     build-platform: linux64-pgo/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - talos
+        - linux-talos-stylo
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
 
 # Stylo builds only run a subset of tests for the moment. So give them
 # their own test set.
@@ -97,17 +99,16 @@ linux64-stylo/debug:
         - stylo-tests
         - devtools-tests
 linux64-stylo/opt:
     build-platform: linux64/opt
     test-sets:
         - awsy-stylo
         - stylo-tests
         - devtools-tests
-        - talos
 macosx64-stylo/debug:
     build-platform: macosx64/debug
     test-sets:
         - stylo-tests
 macosx64-stylo/opt:
     build-platform: macosx64/opt
     test-sets:
         - awsy-stylo
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -127,16 +127,30 @@ qr-tests:
     - xpcshell
 
 jsdcov-code-coverage-tests:
     - mochitest
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - xpcshell
 
+linux-talos-stylo:
+    - talos-chrome-stylo
+    - talos-dromaeojs-stylo
+    - talos-g1-stylo
+    - talos-g2-stylo
+    - talos-g3-stylo
+    - talos-g4-stylo
+    - talos-g5-stylo
+    - talos-other-stylo
+    - talos-svgr-stylo
+    - talos-tp5o-stylo
+    - talos-perf-reftest-stylo
+    - talos-perf-reftest-singletons-stylo
+
 windows-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
     - jsreftest
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1319,21 +1319,17 @@ talos-chrome:
             - --webServer,localhost
 
 talos-chrome-stylo:
     description: "Talos Stylo chrome"
     suite: talos
     try-name: chromez-stylo
     treeherder-symbol: tc-Ts(c)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1375,21 +1371,17 @@ talos-dromaeojs:
             - --webServer,localhost
 
 talos-dromaeojs-stylo:
     description: "Talos Stylo dromaeojs"
     suite: talos
     try-name: dromaeojs-stylo
     treeherder-symbol: tc-Ts(d)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1431,21 +1423,17 @@ talos-g1:
             - --webServer,localhost
 
 talos-g1-stylo:
     description: "Talos Stylo g1"
     suite: talos
     try-name: g1-stylo
     treeherder-symbol: tc-Ts(g1)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 7200
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1488,21 +1476,17 @@ talos-g2:
 
 talos-g2-stylo:
     description: "Talos Stylo g2"
     suite: talos
     try-name: g2-stylo
     treeherder-symbol: tc-Ts(g2)
     virtualization: hardware
     max-run-time: 7200
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
@@ -1537,16 +1521,40 @@ talos-g3:
                     - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=g3
             - --add-option
             - --webServer,localhost
 
+talos-g3-stylo:
+    description: "Talos Stylo g3"
+    suite: talos
+    try-name: g3-stylo
+    treeherder-symbol: tc-Ts(g3)
+    virtualization: hardware
+    run-on-projects: ['mozilla-central', 'try']
+    max-run-time: 3600
+    mozharness:
+        script: talos_script.py
+        no-read-buildbot-config: true
+        config:
+            by-test-platform:
+                macosx.*:
+                    - talos/mac_config.py
+                windows.*:
+                    - talos/windows_config.py
+                default:
+                    - talos/linux_config.py
+        extra-options:
+            - --suite=g3-stylo
+            - --add-option
+            - --webServer,localhost
+
 talos-g4:
     description: "Talos g4"
     suite: talos
     try-name: g4
     treeherder-symbol: tc-T(g4)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
@@ -1571,21 +1579,17 @@ talos-g4:
             - --webServer,localhost
 
 talos-g4-stylo:
     description: "Talos Stylo g4"
     suite: talos
     try-name: g4-stylo
     treeherder-symbol: tc-Ts(g4)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1628,21 +1632,17 @@ talos-g5:
             - --webServer,localhost
 
 talos-g5-stylo:
     description: "Talos Stylo g5"
     suite: talos
     try-name: g5-stylo
     treeherder-symbol: tc-Ts(g5)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1685,21 +1685,17 @@ talos-other:
             - --webServer,localhost
 
 talos-other-stylo:
     description: "Talos Stylo other"
     suite: talos
     try-name: other-stylo
     treeherder-symbol: tc-Ts(o)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1763,21 +1759,17 @@ talos-perf-reftest-singletons:
             - --suite=perf-reftest-singletons
 
 talos-perf-reftest-singletons-stylo:
     description: "Talos Stylo perf-reftest singletons"
     suite: talos
     try-name: perf-reftest-singletons-stylo
     treeherder-symbol: tc-Ts(ps)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1789,21 +1781,17 @@ talos-perf-reftest-singletons-stylo:
             - --suite=perf-reftest-singletons-stylo
 
 talos-perf-reftest-stylo:
     description: "Talos Stylo perf-reftest"
     suite: talos
     try-name: perf-reftest-stylo
     treeherder-symbol: tc-Ts(p)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - talos/windows_config.py
@@ -1841,21 +1829,17 @@ talos-svgr:
             - --webServer,localhost
 
 talos-svgr-stylo:
     description: "Talos Stylo svgr"
     suite: talos
     try-name: svgr-stylo
     treeherder-symbol: tc-Ts(s)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1897,21 +1881,17 @@ talos-tp5o:
             - --webServer,localhost
 
 talos-tp5o-stylo:
     description: "Talos Stylo tp5o"
     suite: talos
     try-name: tp5o-stylo
     treeherder-symbol: tc-Ts(tp)
     virtualization: hardware
-    run-on-projects:
-        by-test-platform:
-            windows.*: ['mozilla-central', 'try']
-            macosx.*: ['mozilla-central', 'try']
-            default: []
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -37,16 +37,20 @@
         "g2-stylo-e10s": {
             "tests": ["damp", "tps"],
             "talos_options": ["--enable-stylo"],
             "pagesets_name": "tp5n.zip"
         },
         "g3-e10s": {
             "tests": ["dromaeo_dom"]
         },
+        "g3-stylo-e10s": {
+            "tests": ["dromaeo_dom"],
+            "talos_options": ["--enable-stylo"]
+        },
         "g4-e10s": {
             "tests": ["basic_compositor_video", "glvideo"]
         },
         "g4-stylo-e10s": {
             "tests": ["basic_compositor_video", "glvideo"],
             "talos_options": ["--enable-stylo"]
         },
         "g5-e10s": {