diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common index 848feec40ef1..81ee63c1f8a0 100644 --- a/mobile/android/config/mozconfigs/common +++ b/mobile/android/config/mozconfigs/common @@ -35,13 +35,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --with-google-api-keyfile=/builds/gapi.data ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key -# Marionette is disabled on Android by default. This condition enables it only on some -# Fennec builds. It remains disabled on "nightly-try", "nightly", release", "beta", etc. -if [ -z "$MOZ_UPDATE_CHANNEL" ] || [ "$MOZ_UPDATE_CHANNEL" = "default" ] \ - || [ "$MOZ_UPDATE_CHANNEL" = "try" ]; -then - ac_add_options --enable-marionette -fi +ac_add_options --enable-marionette # MOZ_INSTALL_TRACKING does not guarantee MOZ_UPDATE_CHANNEL will be set so we # provide a default state. Currently, the default state provides a default diff --git a/taskcluster/ci/test/marionette.yml b/taskcluster/ci/test/marionette.yml index c4625bbcf434..f57647f7a898 100644 --- a/taskcluster/ci/test/marionette.yml +++ b/taskcluster/ci/test/marionette.yml @@ -22,10 +22,6 @@ job-defaults: marionette: description: "Marionette unittest run" treeherder-symbol: Mn - run-on-projects: - by-test-platform: - android-em.*: ["trunk", "try"] - default: built-projects max-run-time: by-test-platform: android-em.*: 3600