Bug 1500509 - Move Android marionette tests to 7.0 x86_64; r=whimboo
authorGeoff Brown <gbrown@mozilla.com>
Wed, 06 Mar 2019 09:09:10 +0000
changeset 520444 4348e60c81ed02630b24c9dfa4b49cf5d0a2b696
parent 520443 0077a71108eb4bd58348a697fafb7e43eddedf50
child 520445 332c017e85ec70c2f26c9a5bc3df39c6abebe3ca
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1500509
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 1500509 - Move Android marionette tests to 7.0 x86_64; r=whimboo Differential Revision: https://phabricator.services.mozilla.com/D22183
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/test-sets.yml
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -4,41 +4,32 @@ job-defaults:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: marionette.py
         config:
             by-test-platform:
                 android-em.*:
                     - android/android_common.py
-                    - android/androidarm_4_3.py
+                    - android/androidx86_7_0.py
                 macosx.*:
                     - marionette/prod_config.py
                     - marionette/mac_taskcluster_config.py
                 windows.*:
                     - marionette/windows_taskcluster_config.py
                 default:
                     - marionette/prod_config.py
                     - remove_executables.py
 
 marionette:
     description: "Marionette unittest run"
     treeherder-symbol: Mn
-    max-run-time:
-        by-test-platform:
-            android-em.*: 3600
-            default: 5400
-    instance-size:
-        by-test-platform:
-            android-em.*: xlarge
-            default: default
-    chunks:
-        by-test-platform:
-            android-em.*: 10
-            default: 1
+    max-run-time: 5400
+    instance-size: default
+    chunks: 1
 
 marionette-headless:
     description: "Marionette headless unittest run"
     treeherder-symbol: MnH
     max-run-time: 5400
     instance-size: default
     mozharness:
         extra-options:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -352,17 +352,16 @@ desktop-screenshot-capture:
 desktop-instrumentation:
     - browser-instrumentation
 
 android-common-tests:
     - cppunit
     - crashtest
     - geckoview-junit
     - jsreftest
-    - marionette
     - mochitest
     - mochitest-chrome
     - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - reftest
     - test-verify
     - xpcshell
@@ -375,16 +374,17 @@ android-x86_64-opt-tests:
     # crashtests failing on debug; bug 1524493
     - crashtest
     # geckoview-junit perma-fail on opt and debug; bug 1521195
     # - geckoview-junit
     - mochitest
 
 android-x86_64-tests:
     - jsreftest
+    - marionette
     - mochitest-clipboard
     - mochitest-gpu
     # various reftest (plain) failures; bug 1501582
     # - reftest
 
 android-x86-tests:
     - web-platform-tests
     - web-platform-tests-reftests