Bug 1460315 - Run Mn suite on both android-4.3-arm7 debug and opt; r=gbrown
authorMaja Frydrychowicz <mjzffr@gmail.com>
Fri, 11 May 2018 15:45:18 -0400
changeset 794985 c58979622f4e662bf6101e1650adf69b8831e3c8
parent 794984 2ad47b8c955525aed5a59b14d925e0f7d5f833a6
child 794986 0e8e2c4c09e275f479cc854b17f18d7d23bea29f
push id109827
push usermozilla@noorenberghe.ca
push dateMon, 14 May 2018 20:13:54 +0000
reviewersgbrown
bugs1460315
milestone62.0a1
Bug 1460315 - Run Mn suite on both android-4.3-arm7 debug and opt; r=gbrown MozReview-Commit-ID: Bq4gJJahwYQ
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
testing/marionette/client/marionette_driver/geckoinstance.py
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/android/androidarm_4_3.py
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -263,17 +263,16 @@ macosx64-qr/debug:
 
 ##
 # Android platforms (matching /android.*/)
 
 android-4.3-arm7-api-16/debug:
     build-platform: android-api-16/debug
     test-sets:
         - android-common-tests
-        - android-debug-tests
         - android-gradle-tests
 
 android-4.3-arm7-api-16/opt:
     build-platform: android-api-16/opt
     test-sets:
         - android-common-tests
         - android-opt-tests
         - android-gradle-tests
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -322,30 +322,27 @@ desktop-instrumentation:
     - browser-instrumentation
 
 android-common-tests:
     - cppunit
     - crashtest
     - geckoview-junit
     # - jittest # not ready yet: bug 1098508
     - jsreftest
+    - marionette
     - mochitest
     - mochitest-chrome
     - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - reftest
     - reftest-fonts
     - test-verify
     - xpcshell
 
-android-debug-tests:
-    # Marionette only available on Fennec debug builds as a security precaution
-    - marionette
-
 android-opt-tests:
     # Robocop tests often fail on Debug builds
     - robocop
 
 android-gradle-tests:
     # geckoview_example is only built in gradle builds
     - geckoview
 
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -91,18 +91,18 @@ class GeckoInstance(object):
         "geo.wifi.scan": False,
 
         # No hang monitor
         "hangmonitor.timeout": 0,
 
         "javascript.options.showInConsole": True,
 
         # Enable Marionette component
+        "marionette.enabled": True,
         # (deprecated and can be removed when Firefox 60 ships)
-        "marionette.enabled": True,
         "marionette.defaultPrefs.enabled": True,
 
         # Disable recommended automation prefs in CI
         "marionette.prefs.recommended": False,
 
         "media.volume_scale": "0.01",
 
         # Do not prompt for temporary redirects
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -17,16 +17,18 @@ config = {
         'install',
         'run-tests',
     ],
     "tooltool_cache": "/builds/worker/tooltool_cache",
     "tooltool_servers": ['http://relengapi/tooltool/'],
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "avds_dir": "/builds/worker/workspace/build/.android",
     "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
+    "marionette_address": "localhost:2828",
+    "marionette_test_manifest": "unit-tests.ini",
 
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -1,18 +1,16 @@
 # mozharness configuration for Android 4.3 unit tests
 #
 # This configuration should be combined with suite definitions and other
 # mozharness configuration from android_common.py, or similar.
 
 config = {
     "deprecated_sdk_path": True,
     "robocop_package_name": "org.mozilla.roboexample.test",
-    "marionette_address": "localhost:2828",
-    "marionette_test_manifest": "unit-tests.ini",
     "tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm_4_3/releng.manifest",
     "emulator_manifest": """
         [
         {
         "size": 38451805,
         "digest": "ac3000aa6846dd1b09a420a1ba84727e393036f49da1419d6c9e5ec2490fc6105c74ca18b616c465dbe693992e2939afd88bc2042d961a9050a3cafd2a673ff4",
         "algorithm": "sha512",
         "filename": "android-sdk_r24.0.2a-linux.tar.gz",