Bug 1498298 - Prepare to run packet.net geckoview tests against x86_64 opt/debug builds; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Fri, 04 Jan 2019 16:46:01 -0700
changeset 452618 135c1ea8854e871f40a2c42211157f37e2b4eda3
parent 452617 e32d3be39b84c40e5bf8dee55d3a3ae8c6773916
child 452619 e0a4fe89a7b0a36b246f79121d7e4fd70bd898b7
child 452631 df5c4c4e6a7a6b29a61acdc18184c6a7708ba369
push id35316
push usershindli@mozilla.com
push dateSat, 05 Jan 2019 04:03:40 +0000
treeherdermozilla-central@e0a4fe89a7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, test-only
bugs1498298
milestone66.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 1498298 - Prepare to run packet.net geckoview tests against x86_64 opt/debug builds; r=me,a=test-only This doesn't actually run anything differently, yet.
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/reftest.yml
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -4,32 +4,32 @@ geckoview-junit:
     treeherder-symbol: gv-junit
     instance-size: xlarge
     loopback-video: true
     e10s: true
     target: geckoview-androidTest.apk
     max-run-time: 3600
     tier:
         by-test-platform:
-            android-em-7.0-x86/opt: 3
+            android-em-7.0-x86/.*: 3
             default: default
     chunks:
         by-test-platform:
             android-em-4.3-arm7-api-16-ccov/debug: 6
             android-em-4.3-arm7-api-16/debug: 6
             android-em-4.3-arm7-api-16/opt: 2
             default: 1
     mozharness:
         script: android_emulator_unittest.py
         config:
             by-test-platform:
-                android-em-7.0-x86/opt:
+                android-em-7.0-x86/.*:
                     - android/android_common.py
                     - android/androidx86_7_0.py
-                android-em.*:
+                android-em-4.*:
                     - android/android_common.py
                     - android/androidarm_4_3_junit.py
         extra-options:
             - --test-suite=geckoview-junit
 
 robocop:
     description: "Robocop run"
     suite: robocop
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -1,29 +1,29 @@
 job-defaults:
     target:
         by-test-platform:
-            android-em-7.0-x86/opt: geckoview-androidTest.apk
+            android-em-7.*: geckoview-androidTest.apk
             default: null
     serviceworker-e10s:
         by-test-platform:
             linux64/debug: both
             default: false
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 android-hw.*: android_hardware_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
-                android-em-7.0-x86/opt:
+                android-em-7.*:
                     - android/android_common.py
                     - android/androidx86_7_0.py
-                android-em.*:
+                android-em-4.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
                 android-hw.*:
                     - android/android_common.py
                     - android/android_hw.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -45,18 +45,18 @@ mochitest:
             default: default
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
             android-em-4.3-arm7-api-16/debug: 60
-            android-em-7.0-x86/opt: 4
-            android-em.*: 24
+            android-em-4.*: 24
+            android-em-7.*: 4
             linux.*/debug: 16
             linux64-asan/opt: 10
             linux64-.*cov/opt: 10
             windows10-64-ccov/debug: 10
             macosx64-ccov/debug: 10
             default: 5
     e10s:
         by-test-platform:
@@ -272,17 +272,17 @@ mochitest-media:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: large
     chunks:
         by-test-platform:
-            android-em-7.0-x86/opt: 1
+            android-em-7.*: 1
             macosx64.*: 1
             windows10-64.*: 1
             default: 3
     mozharness:
         mochitest-flavor: plain
         chunked:
             by-test-platform:
                 android.*: false
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -1,28 +1,28 @@
 job-defaults:
     target:
         by-test-platform:
-            android-em-7.0-x86/opt: geckoview-androidTest.apk
+            android-em-7.*: geckoview-androidTest.apk
             default: null
     serviceworker-e10s:
         by-test-platform:
             linux64/debug: both
             default: false
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
-                android-em-7.0-x86/opt:
+                android-em-7.*:
                     - android/android_common.py
                     - android/androidx86_7_0.py
-                android-em.*:
+                android-em-4.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
@@ -39,18 +39,18 @@ crashtest:
             default: default
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
             android-em-4.3-arm7-api-16/debug: 10
-            android-em-7.0-x86/opt: 1
-            android-em.*: 4
+            android-em-4.3-arm7-api-16/opt: 4
+            android-em-7.*: 1
             default: 1
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             android-em.*: 7200
@@ -65,16 +65,17 @@ jsreftest:
     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/opt: 4
+            android-em-7.0-x86/debug: 8
             android-em.*: 40
             windows.*: 2
             windows10-64-ccov/debug: 5
             linux64-ccov/.*: 5
             linux64-qr/.*: 4
             linux32/debug: 5
             macosx64-ccov/debug: 5
             default: 3
@@ -93,18 +94,18 @@ reftest:
     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-7.0-x86/opt: 5
-            android-em.*: 28
+            android-em-4.*: 28
+            android-em-7.*: 5
             macosx64.*/opt: 2
             macosx64.*/debug: 3
             macosx64-ccov/debug: 6
             windows.*/opt: 2
             windows.*/debug: 4
             windows10-64-ccov/debug: 6
             default: 8
     e10s:
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -596,17 +596,18 @@ def set_treeherder_machine_platform(conf
         # platform based on regular macOS builds, such as for QR.
         # Since it's unclear if the regular macOS builds can be removed from
         # the table, workaround the issue for QR.
         if '-qr' in test['test-platform']:
             test['treeherder-machine-platform'] = test['test-platform']
         elif 'android-hw' in test['test-platform']:
             test['treeherder-machine-platform'] = test['test-platform']
         elif 'android-em-7.0-x86' in test['test-platform']:
-            test['treeherder-machine-platform'] = 'android-em-7-0-x86/opt'
+            opt = test['test-platform'].split('/')[1]
+            test['treeherder-machine-platform'] = 'android-em-7-0-x86/'+opt
         else:
             test['treeherder-machine-platform'] = translation.get(
                 test['build-platform'], test['test-platform'])
         yield test
 
 
 @transforms.add
 def set_tier(config, tests):