Bug 1498298 - Switch most Android 7.0 x86 tests to x86_64 builds; add Android 7.0 x86_64/debug tests; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Tue, 05 Feb 2019 09:05:33 -0700
changeset 456703 908a14f72ae3f7be352ae65533f12befd2a142c0
parent 456702 b33c117cd50d2587c0182e2de09717a79760d8ad
child 456704 86ef2274deffbe467bc466e2d33de895177d8567
push id111702
push usergbrown@mozilla.com
push dateTue, 05 Feb 2019 16:05:49 +0000
treeherdermozilla-inbound@908a14f72ae3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1498298
milestone67.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 - Switch most Android 7.0 x86 tests to x86_64 builds; add Android 7.0 x86_64/debug tests; r=jmaher web-platform tests continue to run on x86 for now; crashtests only run on x86_64/opt for now, since there are several crashes on x86_64/debug; geckoview-junit only runs on x86_64/opt, tier 3, for now, since there are test hangs.
taskcluster/ci/test/misc.yml
taskcluster/ci/test/reftest.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -4,29 +4,29 @@ 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/.*: 3
+            android-em-7.*: 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/.*:
+                android-em-7.*:
                     - android/android_common.py
                     - android/androidx86_7_0.py
                 android-em-4.*:
                     - android/android_common.py
                     - android/androidarm_4_3_junit.py
         extra-options:
             - --test-suite=geckoview-junit
 
@@ -85,20 +85,20 @@ test-verify:
     tier: 2
     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.*:
@@ -128,20 +128,20 @@ test-verify-gpu:
     tier: 2
     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.*:
@@ -165,20 +165,20 @@ test-coverage:
     tier: 2
     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.*:
@@ -206,20 +206,20 @@ test-coverage-gpu:
             default: 2
     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.*:
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -64,18 +64,18 @@ jsreftest:
     run-on-projects: built-projects
     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-7.0-x86_64/opt: 4
+            android-em-7.0-x86_64/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
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -327,17 +327,28 @@ android-em-4.3-arm7-api-16/opt:
     build-platform: android-api-16/opt
     test-sets:
         - android-common-tests
         - android-opt-tests
 
 android-em-7.0-x86/opt:
     build-platform: android-x86/opt
     test-sets:
-        - android-x86-kvm-tests
+        - android-x86-tests
+
+android-em-7.0-x86_64/opt:
+    build-platform: android-x86_64/opt
+    test-sets:
+        - android-x86_64-tests
+        - android-x86_64-opt-tests
+
+android-em-7.0-x86_64/debug:
+    build-platform: android-x86_64/debug
+    test-sets:
+        - android-x86_64-tests
 
 # android-hw test platforms execute on real devices attached to Autophone hosts.
 
 # android-hw-g5-7-0 Motorola Moto G5 Android 7.0
 
 android-hw-g5-7-0-arm7-api-16/opt:
     build-platform: android-api-16/opt
     test-sets:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -369,31 +369,34 @@ android-common-tests:
     - reftest
     - test-verify
     - xpcshell
 
 android-opt-tests:
     # Robocop tests often fail on Debug builds
     - robocop
 
-android-x86-kvm-tests:
+android-x86_64-opt-tests:
     - crashtest
     - geckoview-junit
+
+android-x86_64-tests:
     - jsreftest
     # - mochitest
     # - mochitest-chrome
     - mochitest-clipboard
     - mochitest-gpu
     # - mochitest-media
     # - mochitest-webgl1-core
     # - reftest
     # - test-verify
+
+android-x86-tests:
     - web-platform-tests
     - web-platform-tests-reftests
-    # - web-platform-tests-wdspec
 
 android-ccov-tests:
     - geckoview-junit
     - robocop
 
 devtools-tests:
     - mochitest-devtools-chrome
 
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -595,16 +595,19 @@ def set_treeherder_machine_platform(conf
         # conflict in `verify_task_graph_symbol` once you add a new test
         # 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_64' in test['test-platform']:
+            opt = test['test-platform'].split('/')[1]
+            test['treeherder-machine-platform'] = 'Android-7_0-x86_64/'+opt
         elif 'android-em-7.0-x86' in test['test-platform']:
             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
 
@@ -648,16 +651,18 @@ def set_tier(config, tests):
                                          'macosx64/debug',
                                          'macosx64-nightly/opt',
                                          'macosx64-devedition/opt',
                                          'macosx64-qr/opt',
                                          'macosx64-qr/debug',
                                          'android-em-4.3-arm7-api-16/opt',
                                          'android-em-4.3-arm7-api-16/debug',
                                          'android-em-4.2-x86/opt',
+                                         'android-em-7.0-x86_64/opt',
+                                         'android-em-7.0-x86_64/debug',
                                          'android-em-7.0-x86/opt']:
                 test['tier'] = 1
             else:
                 test['tier'] = 2
 
         yield test