Bug 1721455 - Move remaining Android CI tests to WebRender. r=jmaher

autoland

--- target_task_set@9865f63971f
+++ target_task_set@ao_ci_android
-test-android-em-7.0-x86_64-lite/debug-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-reftest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-test-verify-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-xpcshell-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-junit-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-reftest-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-test-verify-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64-lite/opt-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-media-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-plain-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-plain-gpu-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-reftest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-test-verify-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-test-verify-fis-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-junit-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-mochitest-media-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-mochitest-plain-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-mochitest-plain-gpu-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-reftest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-test-verify-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-test-verify-fis-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-web-platform-tests-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-web-platform-tests-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/opt-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-test-verify-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-test-verify-fis-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-test-verify-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-test-verify-fis-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-qr/opt-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-qr/opt-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-qr/opt-geckoview-test-verify-e10s
+test-android-em-7.0-x86_64-qr/opt-geckoview-test-verify-fis-e10s
-test-android-em-7.0-x86_64/debug-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64/debug-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-gtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64/debug-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64/debug-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64/debug-geckoview-reftest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-test-verify-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-xpcshell-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-gtest-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-test-verify-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64/opt-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-gtest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-junit-e10s
-test-android-em-7.0-x86_64/opt-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64/opt-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64/opt-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64/opt-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64/opt-geckoview-reftest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-test-verify-e10s
-test-android-em-7.0-x86_64/opt-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64/opt-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64/opt-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/opt-geckoview-xpcshell-e10s
+test-android-hw-p2-8-0-android-aarch64-qr/opt-geckoview-jittest-e10s
-test-android-hw-p2-8-0-android-aarch64/opt-geckoview-jittest-e10s

mozilla-central

--- target_task_set@9865f63971f
+++ target_task_set@ao_ci_android
-test-android-em-7.0-x86_64-lite/debug-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-reftest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64-lite/debug-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-media-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-plain-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-mochitest-plain-gpu-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-reftest-noqr-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-web-platform-tests-reftest-e10s
+test-android-em-7.0-x86_64-lite-qr/debug-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-junit-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-reftest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-web-platform-tests-backlog-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-web-platform-tests-reftest-backlog-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64-shippable-lite/opt-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/debug-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-qr/debug-isolated-process-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-crashtest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-crashtest-noqr-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-junit-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-junit-e10s-single-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-junit-fis-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-mochitest-media-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-mochitest-media-noqr-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-mochitest-plain-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-mochitest-plain-gpu-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-reftest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-reftest-noqr-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-web-platform-tests-backlog-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-web-platform-tests-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-web-platform-tests-reftest-backlog-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-web-platform-tests-reftest-e10s
+test-android-em-7.0-x86_64-shippable-lite-qr/opt-geckoview-xpcshell-e10s
+test-android-em-7.0-x86_64-shippable-qr/opt-geckoview-cppunit-e10s
+test-android-em-7.0-x86_64-shippable-qr/opt-geckoview-gtest-e10s
+test-android-em-7.0-x86_64-shippable-qr/opt-geckoview-web-platform-tests-backlog-e10s
+test-android-em-7.0-x86_64-shippable-qr/opt-geckoview-web-platform-tests-reftest-backlog-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-gtest-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-junit-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-reftest-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-web-platform-tests-backlog-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-web-platform-tests-reftest-backlog-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64-shippable/opt-geckoview-xpcshell-e10s
-test-android-em-7.0-x86_64/debug-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64/debug-geckoview-crashtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-gtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64/debug-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64/debug-geckoview-mochitest-plain-e10s
-test-android-em-7.0-x86_64/debug-geckoview-mochitest-plain-gpu-e10s
-test-android-em-7.0-x86_64/debug-geckoview-reftest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-crashtest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-e10s
-test-android-em-7.0-x86_64/debug-geckoview-web-platform-tests-reftest-e10s
-test-android-em-7.0-x86_64/debug-geckoview-xpcshell-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-cppunit-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-gtest-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-e10s-single-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-junit-fis-e10s
-test-android-em-7.0-x86_64/debug-isolated-process-geckoview-web-platform-tests-crashtest-e10s
+test-android-em-7.0-x86_64-shippable-qr/opt-geckoview-xpcshell-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-mobile-geckoview-youtube-playback-h264-sfr-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-mobile-geckoview-youtube-playback-hfr-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-allrecipes-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-amazon-search-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-espn-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-facebook-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-google-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-microsoft-support-e10s
-test-android-hw-g5-7-0-arm7-shippable/opt-browsertime-tp6m-essential-geckoview-youtube-watch-e10s
+test-android-hw-p2-8-0-android-aarch64-qr/debug-geckoview-jittest-e10s
+test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt-browsertime-speedometer-mobile-chrome-m-e10s
+test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt-browsertime-speedometer-mobile-fenix-e10s
+test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt-browsertime-unity-webgl-mobile-chrome-m-e10s
+test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt-browsertime-unity-webgl-mobile-fenix-e10s
+test-android-hw-p2-8-0-android-aarch64-shippable-qr/opt-geckoview-jittest-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-mobile-geckoview-youtube-playback-h264-sfr-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-mobile-geckoview-youtube-playback-hfr-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-mobile-geckoview-youtube-playback-vp9-sfr-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-speedometer-mobile-chrome-m-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-speedometer-mobile-fenix-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-speedometer-mobile-geckoview-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-allrecipes-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-amazon-search-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-espn-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-facebook-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-google-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-microsoft-support-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-tp6m-essential-geckoview-youtube-watch-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-unity-webgl-mobile-chrome-m-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-unity-webgl-mobile-fenix-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-browsertime-unity-webgl-mobile-geckoview-e10s
-test-android-hw-p2-8-0-android-aarch64-shippable/opt-geckoview-jittest-e10s
-test-android-hw-p2-8-0-android-aarch64/debug-geckoview-jittest-e10s
-test-android-hw-p2-8-0-arm7-shippable/opt-geckoview-jittest-all-e10s
-test-android-hw-p2-8-0-arm7/debug-geckoview-jittest-e10s
+test-android-hw-p2-8-0-arm7-qr/debug-geckoview-jittest-e10s
+test-android-hw-p2-8-0-arm7-shippable-qr/opt-geckoview-jittest-all-e10s

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

taskcluster/ci/test/browsertime-mobile.yml

@@ -10,7 +10,7 @@ job-defaults:
             refbrow: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
                     default: []
     tier: 3
     test-manifest-loader: null  # don't load tests in the taskgraph
@@ -62,7 +62,7 @@ job-defaults:
     limit-platforms:
         by-app:
             chrome-m:
-                - .*shippable(?!-qr).*
+                - .*shippable-qr.*
             default: []
 
 browsertime-tp6m:
@@ -268,7 +268,6 @@ browsertime-tp6m-profiling:
             - --gecko-profile
     run-on-projects:
         by-test-platform:
-            android-hw-p2-.*aarch64-shippable/opt: []
             android-hw-p2-.*aarch64-shippable-qr/opt: [mozilla-central]
             default: []
 
@@ -284,13 +283,12 @@ browsertime-speedometer-mobile:
             refbrow: []
             geckoview:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta]
                     android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta]
                     default: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
                     default: []
     treeherder-symbol: Btime(sp)
     mozharness:
@@ -307,13 +305,12 @@ browsertime-unity-webgl-mobile:
             refbrow: []
             geckoview:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
                     android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta]
                     android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta]
                     default: []
             default:
                 by-test-platform:
-                    android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central]
+                    android-hw-p2-.*aarch64-shippable-qr.*: [mozilla-central]
                     default: []
     max-run-time: 900
     mozharness:

taskcluster/ci/test/compiled.yml

@@ -75,8 +75,8 @@ jittest:
     treeherder-symbol: Jit
     run-on-projects:
         by-test-platform:
-            android-hw-.*-aarch64/debug: ['mozilla-central', 'release']
-            android-hw-.*-arm7/debug: ['mozilla-central', 'release']
+            android-hw-.*-aarch64-qr/debug: ['mozilla-central', 'release']
+            android-hw-.*-arm7-qr/debug: ['mozilla-central', 'release']
             default: built-projects
     chunks:
         by-test-platform:
@@ -114,7 +114,7 @@ jittest-all:
     treeherder-symbol: Jit
     run-on-projects:
         by-test-platform:
-            android-hw-.*-arm7(?:-shippable)?/.*: ['mozilla-central', 'release']
+            android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
             default: []
     chunks: 10
     max-run-time: 3600

taskcluster/ci/test/mochitest.yml

@@ -24,7 +24,7 @@ job-defaults:
                     default: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
     mozharness:
         script:
@@ -79,7 +79,7 @@ mochitest-plain:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     default: built-projects
     chunks:
         by-test-platform:
@@ -333,7 +333,7 @@ mochitest-plain-gpu:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     default: built-projects
     virtualization:
         by-test-platform:
@@ -345,7 +345,7 @@ mochitest-plain-gpu:
             fission: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
     mozharness:
         mochitest-flavor: plain
@@ -433,7 +433,7 @@ mochitest-media:
                     windows10-64-asan-qr/opt: ['trunk']
                     android-hw-.*(?<!-shippable)(-qr)?/opt: ['autoland']
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     (linux|windows10-64|macos)(?!.*-qr).*: []
                     default: built-projects
@@ -449,7 +449,7 @@ mochitest-media:
                 by-test-platform:
                     android-hw-.*/opt: []
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     .*-tsan/opt: ['trunk']
                     linux.*(asan|ccov)/opt: []
                     .*(ccov/|asan/|-32).*: built-projects
@@ -460,7 +460,6 @@ mochitest-media:
         by-test-platform:
             android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'socketprocess', 'fission', 'noqr']
             android-em.*-qr.*: ['fission', 'fission-webgl-ipc', 'webgl-ipc', 'noqr']
-            android-em-7.*: ['fission']
             android-.*/opt: []
             android.*: ['socketprocess']
             .*-ccov-qr.*/.*: ['noqr']
@@ -506,7 +505,7 @@ mochitest-media:
             default:
                 by-test-platform:
                     android-em.*: 1
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     windows10-aarch64-qr.*: 2
                     android-hw.*: 1
                     macosx1100.*: 2
@@ -620,7 +619,7 @@ mochitest-webgl1-core:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
@@ -660,7 +659,7 @@ mochitest-webgl1-ext:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
@@ -699,7 +698,7 @@ mochitest-webgl2-core:
         by-test-platform:
             .*-tsan/opt: ['trunk']
             android-hw-.*(?<!-shippable)(-qr)?/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-            android-hw.*aarch.*-shippable/opt: ['mozilla-central']
+            android-hw.*aarch.*-shippable-qr/opt: ['mozilla-central']
             default: built-projects
     tier:
         by-test-platform:

taskcluster/ci/test/raptor-gve.yml

@@ -7,9 +7,9 @@ job-defaults:
     suite: raptor
     run-on-projects:
         by-test-platform:
-            android-hw-p2-.*-arm7/(?!opt).*: []
-            android-hw-p2-.*-arm7-shippable/opt: []
-            android-hw(?!-p2).*(?<!-arm7-shippable)/opt.*: []
+            android-hw-p2-.*-arm7-qr/(?!opt).*: []
+            android-hw-p2-.*-arm7-shippable-qr/opt: []
+            android-hw(?!-p2).*(?<!-arm7-shippable)-qr/opt.*: []
             default: [mozilla-central]
     target: geckoview_example.apk
     test-manifest-loader: null  # don't load tests in the taskgraph

taskcluster/ci/test/reftest.yml

@@ -74,7 +74,7 @@ crashtest:
             default:
                 by-test-platform:
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     linux.*asan/opt: []
                     .*(-asan|-tsan|10-32|7-32).*: built-projects
                     android.*: built-projects
@@ -92,7 +92,7 @@ crashtest:
                     windows10-aarch64-qr.*: 2
                     macosx1100.*: 2
                     android-hw-.*-qr/.*: 2
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
 
 crashtest-qr:
@@ -146,8 +146,8 @@ jsreftest:
             fission: []
             default:
                 by-test-platform:
-                    android-hw-.*-aarch64(?:-shippable)?/.*: ['mozilla-central', 'release']
-                    android-hw-.*-arm7(?:-shippable)?/.*: ['mozilla-central', 'release']
+                    android-hw-.*-aarch64(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
+                    android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
                     default: built-projects
     virtualization:
         by-test-platform:
@@ -201,7 +201,7 @@ reftest:
             default:
                 by-test-platform:
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     linux.*asan/opt: []
                     .*(mingwclang|-asan|-tsan|10-32|7-32).*: built-projects
                     windows10-aarch64-qr/opt: built-projects
@@ -233,7 +233,7 @@ reftest:
                     windows10-aarch64-qr.*: 2
                     android-hw-.*-qr/.*: 2
                     macosx1100.*: 2
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
 
 reftest-qr:

taskcluster/ci/test/test-platforms.yml

@@ -413,78 +413,49 @@ macosx1014-64-shippable-qr/opt:
 #
 # android-em test platforms execute on android emulators.
 
-android-em-7.0-x86_64/opt:
+android-em-7.0-x86_64-qr/opt:
     build-platform: android-x86_64/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-lite/opt:
+android-em-7.0-x86_64-lite-qr/opt:
     build-platform: android-x86_64-lite/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-shippable/opt:
+android-em-7.0-x86_64-shippable-qr/opt:
     build-platform: android-x86_64-shippable/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64-shippable-lite/opt:
+android-em-7.0-x86_64-shippable-lite-qr/opt:
     build-platform: android-x86_64-shippable-lite/opt
     test-sets:
         - android-x86_64-tests
         - web-platform-tests-backlog
 
-android-em-7.0-x86_64/debug:
+android-em-7.0-x86_64-qr/debug:
     build-platform: android-x86_64/debug
     test-sets:
         - android-x86_64-tests
 
-android-em-7.0-x86_64-lite/debug:
+android-em-7.0-x86_64-lite-qr/debug:
     build-platform: android-x86_64-lite/debug
     test-sets:
         - android-x86_64-tests
 
-android-em-7.0-x86_64/debug-isolated-process:
+android-em-7.0-x86_64-qr/debug-isolated-process:
     build-platform: android-x86_64/debug-isolated-process
     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:
-        - android-x86_64-qr-tests
-
-android-em-7.0-x86_64-qr/debug:
-    build-platform: android-x86_64/debug
-    test-sets:
-        - android-x86_64-qr-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/opt:
-    build-platform: android-arm/opt
-    test-sets:
-        - android-hw-browsertime
-        - android-hw-arm7-raptor-cpu-memory
-        - android-hw-arm7-raptor-cpu-memory-power
-
-android-hw-g5-7-0-arm7-shippable/opt:
-    build-platform: android-arm-shippable/opt
-    test-sets:
-        - android-hw-browsertime
-        - android-hw-arm7-raptor-cpu-memory
-        - android-hw-arm7-raptor-cpu-memory-power
-
 android-hw-g5-7-0-arm7-qr/opt:
     build-platform: android-arm/opt
     test-sets:
@@ -501,7 +472,7 @@ android-hw-g5-7-0-arm7-shippable-qr/opt:
 
 # android-hw-p2-8-0 Google Pixel 2 Android 8.0
 
-android-hw-p2-8-0-arm7/opt:
+android-hw-p2-8-0-arm7-qr/opt:
     build-platform: android-arm/opt
     test-sets:
         - android-hw-browsertime
@@ -509,7 +480,7 @@ android-hw-p2-8-0-arm7/opt:
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
 
-android-hw-p2-8-0-arm7-shippable/opt:
+android-hw-p2-8-0-arm7-shippable-qr/opt:
     build-platform: android-arm-shippable/opt
     test-sets:
         - android-hw-browsertime
@@ -517,7 +488,7 @@ android-hw-p2-8-0-arm7-shippable/opt:
         - android-hw-arm7-raptor-cpu-memory
         - android-hw-arm7-raptor-cpu-memory-power
 
-android-hw-p2-8-0-arm7/debug:
+android-hw-p2-8-0-arm7-qr/debug:
     build-platform: android-arm/debug
     test-sets:
         - android-hw-arm7-debug-unittests
@@ -525,59 +496,36 @@ android-hw-p2-8-0-arm7/debug:
 android-hw-p2-8-0-android-aarch64-qr/opt:
     build-platform: android-aarch64/opt
     test-sets:
-        - android-hw-aarch64-qr
+        - android-hw-aarch64
         - android-hw-browsertime
+        - android-hw-aarch64-opt-unittests
         - android-hw-aarch64-raptor-cpu-memory
         - android-hw-aarch64-raptor-cpu-memory-power
 
 android-hw-p2-8-0-android-aarch64-shippable-qr/opt:
     build-platform: android-aarch64-shippable/opt
     test-sets:
-        - android-hw-aarch64-qr
+        - android-hw-aarch64
         - android-hw-browsertime
         - android-hw-browsertime-profiling
+        - android-hw-aarch64-pgo-unittests
         - android-hw-aarch64-raptor-cpu-memory
         - android-hw-aarch64-raptor-cpu-memory-power
 
 android-hw-p2-8-0-android-aarch64-qr/debug:
     build-platform: android-aarch64/debug
     test-sets:
-        - android-hw-aarch64-qr
-
-android-hw-p2-8-0-android-aarch64/opt:
-    build-platform: android-aarch64/opt
-    test-sets:
-        - android-hw-browsertime
-        - android-hw-aarch64-opt-unittests
-        - android-hw-aarch64-raptor-cpu-memory
-        - android-hw-aarch64-raptor-cpu-memory-power
-
-android-hw-p2-8-0-android-aarch64-shippable/opt:
-    build-platform: android-aarch64-shippable/opt
-    test-sets:
-        - android-hw-browsertime
-        - android-hw-aarch64-pgo-unittests
-        - android-hw-aarch64-raptor-cpu-memory
-        - android-hw-aarch64-raptor-cpu-memory-power
-
-android-hw-p2-8-0-android-aarch64/debug:
-    build-platform: android-aarch64/debug
-    test-sets:
+        - android-hw-aarch64
         - android-hw-aarch64-debug-unittests
 
 # android-hw-s7-8-0 Samsung Galaxy S7 Android 8.0
 
-android-hw-s7-8-0-android-aarch64-shippable/opt:
-    build-platform: android-aarch64-shippable/opt
-    test-sets:
-        - android-hw-browsertime
-
-android-hw-s7-8-0-arm7-api-16/opt:
+android-hw-s7-8-0-arm7-api-16-qr/opt:
     build-platform: android-api-16/opt
     test-sets:
         - android-hw-browsertime
 
-android-hw-s7-8-0-arm7-api-16-shippable/opt:
+android-hw-s7-8-0-arm7-api-16-shippable-qr/opt:
     build-platform: android-api-16-shippable/opt
     test-sets:
         - android-hw-browsertime
@@ -591,8 +539,3 @@ android-hw-s7-8-0-android-aarch64-shippable-qr/opt:
     build-platform: android-aarch64-shippable/opt
     test-sets:
         - android-hw-browsertime
-
-android-hw-s7-8-0-android-aarch64/opt:
-    build-platform: android-aarch64/opt
-    test-sets:
-        - android-hw-browsertime

taskcluster/ci/test/test-sets.yml

@@ -487,17 +487,6 @@ android-x86_64-tests:
     - web-platform-tests-reftest
     - xpcshell
 
-android-x86_64-qr-tests:
-    - crashtest
-    - geckoview-junit
-    - mochitest-media
-    - mochitest-plain
-    - mochitest-plain-gpu
-    - web-platform-tests
-    - web-platform-tests-crashtest
-    - web-platform-tests-reftest
-    - reftest
-
 android-hw-aarch64-opt-unittests:
     - jittest
 
@@ -513,7 +502,7 @@ android-hw-arm7-debug-unittests:
 android-hw-aarch64-debug-unittests:
     - jittest
 
-android-hw-aarch64-qr:
+android-hw-aarch64:
     - crashtest-qr
     - reftest-qr
     - mochitest-media

taskcluster/ci/test/web-platform.yml

@@ -33,9 +33,9 @@ job-defaults:
                     - remove_executables.py
     target:
         by-test-platform:
-            android-em-7.0-x86_64-shippable(-qr|-lite)?/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-qr|-lite)?/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-qr|-lite)?/debug(-isolated-process)?: geckoview-androidTest.apk
+            android-em-7.0-x86_64-shippable(-lite)?-qr/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-lite)?-qr/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-lite)?-qr/debug(-isolated-process)?: geckoview-androidTest.apk
             default: null
     python-3: true
 
@@ -57,7 +57,7 @@ web-platform-tests:
                     default: 2
             default:
                 by-test-platform:
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
     chunks:
         by-test-platform:
@@ -94,7 +94,7 @@ web-platform-tests:
                     linux.*-qr/.*: ['release']  # skip on integration branches due to high load, bug 1599197
                     windows.*-qr/.*: ['release']  # skip on integration branches due to high load
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     default: built-projects
     mozharness:
         chunked: true
@@ -174,7 +174,7 @@ web-platform-tests-reftest:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     default: built-projects
     tier:
         by-variant:
@@ -187,7 +187,7 @@ web-platform-tests-reftest:
             default:
                 by-test-platform:
                     linux1804-64-asan(-qr)?/opt: 2
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
     mozharness:
         extra-options:

taskcluster/ci/test/xpcshell.yml

@@ -49,7 +49,7 @@ xpcshell:
             default:
                 by-test-platform:
                     .*-tsan/opt: ['trunk']
-                    android-em-7.0-x86_64/debug-isolated-process: []
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
                     windows10-64-asan-qr/opt: []  # No XPCShell on ASAN yet
                     default: built-projects
     chunks:
@@ -76,7 +76,7 @@ xpcshell:
                 by-test-platform:
                     windows10-64-asan.*: 3
                     macosx1100.*: 2
-                    android-em-7.0-x86_64/debug-isolated-process: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
                     default: default
     fetches:
         toolchain:

taskcluster/taskgraph/transforms/tests.py

@@ -1454,6 +1454,7 @@ def handle_tier(config, tasks):
                 "android-em-7.0-x86-shippable-lite/opt",
                 "android-em-7.0-x86_64-shippable-qr/opt",
                 "android-em-7.0-x86_64-qr/debug",
+                "android-em-7.0-x86_64-qr/debug-isolated-process",
                 "android-em-7.0-x86_64-qr/opt",
             ]:
                 task["tier"] = 1