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

@@ -9,7 +9,7 @@ geckoview-junit:
     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:
@@ -21,10 +21,10 @@ geckoview-junit:
         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:

taskcluster/ci/test/mochitest.yml

@@ -1,7 +1,7 @@
 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:
@@ -15,10 +15,10 @@ job-defaults:
                 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.*:
@@ -50,8 +50,8 @@ mochitest:
     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
@@ -277,7 +277,7 @@ mochitest-media:
             default: large
     chunks:
         by-test-platform:
-            android-em-7.0-x86/opt: 1
+            android-em-7.*: 1
             macosx64.*: 1
             windows10-64.*: 1
             default: 3

taskcluster/ci/test/reftest.yml

@@ -1,7 +1,7 @@
 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:
@@ -14,10 +14,10 @@ job-defaults:
                 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.*:
@@ -44,8 +44,8 @@ crashtest:
     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:
@@ -70,6 +70,7 @@ jsreftest:
         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
@@ -98,8 +99,8 @@ reftest:
     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

taskcluster/taskgraph/transforms/tests.py

@@ -601,7 +601,8 @@ def set_treeherder_machine_platform(config, tests):
         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'])