Bug 1646767: Android opt tests completely missing from taskgraph on try r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D80920

taskcluster/ci/build/android.yml

@@ -152,6 +152,7 @@ android-api-16/opt:
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         config: ["builds/releng_base_android_64_builds.py"]
@@ -280,6 +281,7 @@ android-x86_64/opt:
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         config: ["builds/releng_base_android_64_builds.py"]

taskcluster/ci/test/browsertime-mobile.yml

@@ -138,7 +138,7 @@ browsertime-tp6m:
                                 by-test-platform:
                                     &android-cold-settings
                                     # Ignore platforms without `shippable` in the name
-                                    android-hw-.*(?<!-shippable)/opt: []
+                                    android-hw-.*(?<!api-16)(?<!-shippable)/opt: []
                                     # Exclude api-16 P2 builds
                                     android-hw-p2-.*api-16.*: []
                                     # Run tests on G5 arm, and P2 aarch64 shippable builds
@@ -146,7 +146,7 @@ browsertime-tp6m:
                             warm:
                                 by-test-platform:
                                     &android-warm-settings
-                                    android-hw-.*(?<!-shippable)/opt: []
+                                    android-hw-.*(?<!api-16)(?<!-shippable)/opt: []
                                     android-hw-p2-.*api-16.*: []
                                     default: ['mozilla-central']
                     default:

taskcluster/ci/test/test-platforms.yml

@@ -403,6 +403,11 @@ macosx1014-64-ccov/opt:
 #
 # android-em test platforms execute on android emulators.
 
+android-em-7.0-x86_64/opt:
+    build-platform: android-x86_64/opt
+    test-sets:
+        - android-x86_64-tests
+
 android-em-7.0-x86_64-shippable/opt:
     build-platform: android-x86_64-shippable/opt
     test-sets:
@@ -413,6 +418,11 @@ android-em-7.0-x86_64/debug:
     test-sets:
         - android-x86_64-tests
 
+android-em-7.0-x86_64-qr/opt:
+    build-platform: android-x86_64/opt
+    test-sets:
+        - android-x86_64-qr-tests
+
 android-em-7.0-x86_64-shippable-qr/opt:
     build-platform: android-x86_64-shippable/opt
     test-sets:
@@ -427,6 +437,16 @@ android-em-7.0-x86_64-qr/debug:
 
 # 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:
+        - android-hw-arm7-browsertime
+        - android-hw-arm7-raptor
+        - android-hw-arm7-raptor-power
+        - android-hw-arm7-raptor-cpu-memory
+        - android-hw-arm7-raptor-cpu-memory-power
+        - raptor-fetch-geckoview
+
 android-hw-g5-7-0-arm7-api-16-shippable/opt:
     build-platform: android-api-16-shippable/opt
     test-sets:
@@ -439,6 +459,17 @@ android-hw-g5-7-0-arm7-api-16-shippable/opt:
 
 # android-hw-p2-8-0 Google Pixel 2 Android 8.0
 
+android-hw-p2-8-0-arm7-api-16/opt:
+    build-platform: android-api-16/opt
+    test-sets:
+        - android-hw-arm7-browsertime
+        - android-hw-arm7-pgo-unittests
+        - android-hw-arm7-raptor
+        - android-hw-arm7-raptor-power
+        - android-hw-arm7-raptor-cpu-memory
+        - android-hw-arm7-raptor-cpu-memory-power
+        - raptor-fetch-geckoview
+
 android-hw-p2-8-0-arm7-api-16-shippable/opt:
     build-platform: android-api-16-shippable/opt
     test-sets:
@@ -455,6 +486,11 @@ android-hw-p2-8-0-arm7-api-16/debug:
     test-sets:
         - android-hw-arm7-debug-unittests
 
+android-hw-p2-8-0-android-aarch64-qr/opt:
+    build-platform: android-api-16/opt
+    test-sets:
+        - android-hw-aarch64-qr
+
 android-hw-p2-8-0-android-aarch64-shippable-qr/opt:
     build-platform: android-api-16-shippable/opt
     test-sets: