Bug 1484220 - Enable marionette in all fennec builds; r=snorp
authorGeoff Brown <gbrown@mozilla.com>
Mon, 27 Aug 2018 07:19:02 -0600
changeset 488624 9e979fcf44ddcba566b49df5eb0cb8f80f4861c1
parent 488623 99a5217b0171fc8cf57b3d1fc3a6c2905128d04f
child 488625 eb4d9eac9c87a117de0694853bff430c2a970690
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1484220
milestone63.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 1484220 - Enable marionette in all fennec builds; r=snorp
mobile/android/config/mozconfigs/common
taskcluster/ci/test/marionette.yml
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -30,23 +30,17 @@ if [ -z "$NO_NDK" ]; then
     ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
 fi
 
 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
 # keyfile because an assertion will be thrown if MOZ_INSTALL_TRACKING is
 # specified but a keyfile is not. This assertion can catch if we misconfigure a
 # release or beta build and it does not have a valid keyfile.
 #
 # However, by providing a default keyfile, if we misconfigure beta or release,
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -17,20 +17,16 @@ job-defaults:
                     - marionette/windows_taskcluster_config.py
                 default:
                     - marionette/prod_config.py
                     - remove_executables.py
 
 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
             default: 5400
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default