Bug 1552251 - Clean up some Android chunking rules. r=gbrown
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 16 May 2019 17:27:03 +0000
changeset 536034 7a0539ac539fe33bc1883fb18aa5b98141600c96
parent 536033 ef90ec1b75ea67bea9db8cca282c9852d73794db
child 536035 b0887a64bb5fa71d8a2428579f581c7a8dadddf2
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1552251
milestone68.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 1552251 - Clean up some Android chunking rules. r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D31498
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/reftest.yml
taskcluster/ci/test/xpcshell.yml
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -13,19 +13,18 @@ geckoview-junit:
     max-run-time: 3600
     tier:
         by-test-platform:
             android-em-7.*: 3
             default: default
     chunks:
         by-test-platform:
             android-em-4.3-arm7-api-16-ccov/debug: 8
-            android-em-4.3-arm7-api-16/debug: 8
-            android-em-4.3-arm7-api-16/opt: 3
-            android-em-4.3-arm7-api-16/pgo: 3
+            android-em-4.3-arm7-api-16.*\/debug: 8
+            android-em-4.*\/(?:opt|pgo)?: 3
             default: 1
     run-on-projects:
         by-test-platform:
             android-em-4.3-arm7-api-16/opt: ['try']
             default: built-projects
     mozharness:
         script: android_emulator_unittest.py
         config:
@@ -43,18 +42,17 @@ robocop:
     description: "Robocop run"
     suite: robocop
     treeherder-symbol: M(rc)
     instance-size: xlarge
     chunks:
         by-test-platform:
             # android-em-4.3-arm7-api-16/debug -- not run
             android-em-4.3-arm7-api-16-ccov/debug: 8
-            android-em-4.3-arm7-api-16/opt: 4
-            android-em-4.3-arm7-api-16/pgo: 4
+            android-em-4.*\/(?:opt|pgo)?: 4
     loopback-video: true
     e10s: false
     run-on-projects:
         by-test-platform:
             android-em-4.3-arm7-api-16/opt: ['try']
             default: built-projects
     mozharness:
         script: android_emulator_unittest.py
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -59,18 +59,18 @@ mochitest:
             android-em.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10-64(?:-pgo|-shippable)?-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 60
-            android-em-4.*: 24
+            android-em-4.*\/debug: 60
+            android-em-4.*\/(?:opt|pgo)?: 24
             android-em-7.*: 4
             linux.*/debug: 16
             linux64-asan/opt: 10
             linux64-.*cov/opt: 10
             windows10-64-ccov/debug: 10
             macosx.*64-ccov/debug: 10
             default: 5
     e10s:
@@ -182,19 +182,19 @@ mochitest-chrome:
             windows10-aarch64.*: 2
             default: default
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 8
-            android-em-7.0-x86/opt: 1
-            android-em.*: 4
+            android-em-4.*\/debug: 8
+            android-em.4.*\/(?:opt|pgo)?: 4
+            android-em-7.*: 1
             default: 3
     max-run-time:
         by-test-platform:
             android-em.*: 7200
             default: 3600
     e10s: false
     mozharness:
         mochitest-flavor: chrome
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -47,19 +47,18 @@ crashtest:
             android-em.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10-64(?:-pgo|-shippable)?-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 10
-            android-em-4.3-arm7-api-16/opt: 4
-            android-em-4.3-arm7-api-16/pgo: 4
+            android-em-4.*\/debug: 10
+            android-em-4.*\/(?:opt|pgo)?: 4
             android-em-7.*: 1
             default: 1
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
     max-run-time:
         by-test-platform:
@@ -75,20 +74,20 @@ jsreftest:
     schedules-component: jsreftest
     treeherder-symbol: R(J)
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 100
-            android-em-7.0-x86_64/opt: 4
-            android-em-7.0-x86_64/debug: 8
-            android-em.*: 40
+            android-em-4.*\/debug: 100
+            android-em.4.*\/(?:opt|pgo)?: 40
+            android-em-7.*\/debug: 8
+            android-em.7.*\/(?:opt|pgo)?: 4
             windows.*: 2
             windows10-64-ccov/debug: 5
             linux64-ccov/.*: 5
             linux64-qr/opt: 4
             linux64-qr/debug: 5
             linux32/debug: 5
             linux64/debug: 5
             macosx.*64-ccov/debug: 5
@@ -109,18 +108,18 @@ reftest:
     treeherder-symbol: R(R)
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     virtualization: virtual-with-gpu
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 56
-            android-em-4.*: 28
+            android-em-4.*\/debug: 56
+            android-em.4.*\/(?:opt|pgo)?: 28
             android-em-7.*: 5
             linux64(-shippable|-devedition|-qr)?/opt: 5
             macosx101.*-64/opt: 2
             macosx101.*-64/debug: 3
             macosx.*64-ccov/debug: 6
             windows.*/opt: 2
             windows.*/debug: 4
             windows10-64-ccov/debug: 6
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -40,30 +40,30 @@ xpcshell:
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             windows10-aarch64/opt: ['try', 'mozilla-central']
             android-em-4.3-arm7-api-16/opt: ['try']
             default: built-projects
     chunks:
         by-test-platform:
-            android-em-4.3-arm7-api-16/.*: 8
+            android-em-4.*: 8
             android-em-7.*: 3
             macosx10(10|14)-64/.*: 2
             linux64(-qr)?/debug: 6
             .*-ccov/debug: 6
             windows(7-32|10-64)(-shippable|-devedition|-asan|.*-qr)?/.*: 2
             windows10-aarch64/opt: 3
             default: 5
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     max-run-time:
         by-test-platform:
-            android-em-4.3-arm7-api-16/debug: 7200
+            android-em-4.*\/debug: 7200
             default: 5400
     allow-software-gl-layers: false
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             windows10-aarch64.*: 2
             default: default