Bug 1433308 - Remove Android 6.0/x86-6.0 options for mach android-emulator; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Thu, 07 Jun 2018 17:00:45 -0600
changeset 478623 18845b2e2a11fbfd27f532d01212d23a181a2860
parent 478622 0d24499ad4e81c211f892a3e2d025d2677b4eee8
child 478624 1eee411e9a96bacd910bc15e3fd159a6385fa6dd
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, test-only
bugs1433308
milestone62.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 1433308 - Remove Android 6.0/x86-6.0 options for mach android-emulator; r=me,a=test-only mach android-emulator currently supports 6 different avds; I am struggling to maintain that many configurations. I don't see a lot of value in keeping both 6.0 and 7.0, and Android 6.0 is not as popular as 7.0. Let's remove 6.0, encouraging 7.0 as an alternative; same for x86-6.0 -> x86-7.0.
mobile/android/mach_commands.py
testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest
testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -538,19 +538,19 @@ class AndroidEmulatorCommands(MachComman
        Run the Android emulator with one of the AVDs used in the Mozilla
        automated test environment. If necessary, the AVD is fetched from
        the tooltool server and installed.
     """
     @Command('android-emulator', category='devenv',
              conditions=[],
              description='Run the Android emulator with an AVD from test automation.')
     @CommandArgument('--version', metavar='VERSION',
-                     choices=['4.3', '6.0', '7.0', 'x86', 'x86-6.0', 'x86-7.0'],
+                     choices=['4.3', '7.0', 'x86', 'x86-7.0'],
                      help='Specify Android version to run in emulator. '
-                     'One of "4.3", "6.0", "7.0", "x86", "x86-6.0", or "x86-7.0".',
+                     'One of "4.3", "7.0", "x86", or "x86-7.0".',
                      default='4.3')
     @CommandArgument('--wait', action='store_true',
                      help='Wait for emulator to be closed.')
     @CommandArgument('--force-update', action='store_true',
                      help='Update AVD definition even when AVD is already installed.')
     @CommandArgument('--verbose', action='store_true',
                      help='Log informative status messages.')
     def emulator(self, version, wait=False, force_update=False, verbose=False):
deleted file mode 100644
--- a/testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "size": 276089293,
-    "digest": "a5aca63869d9ca9770b2f760923e65c08a36e4235f4bf9c422c9fd005c78b24bd7d8c74e9b8d11a4606d1d7081bd7181866f1ec50d1d87ad8de93521090d2d36",
-    "algorithm": "sha512",
-    "filename": "AVDs-armv7a-android-6.0-build-2016-08-12.tar.gz",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 416677519,
-    "visibility": "public",
-    "digest": "11a1be4d1f1085b1aa516c4f37b4a5d1e81e13bccd1243ebf8bf8431fd3738830675ea3719888ac43931b3b73508040090fd2ff6dd98f99db2678a7cfd6b18a4",
-    "algorithm": "sha512",
-    "filename": "AVDs-x86-android-6.0-build-2017-03-10.tar.gz",
-    "unpack": true
-  }
-]
--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -57,48 +57,31 @@ class AvdInfo(object):
    and the parameters for each reflect those used in mozharness.
 """
 AVD_DICT = {
     '4.3': AvdInfo('Android 4.3',
                    'mozemulator-4.3',
                    'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
                    ['-skip-adb-auth', '-verbose', '-show-kernel'],
                    False),
-    '6.0': AvdInfo('Android 6.0',
-                   'mozemulator-6.0',
-                   'testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest',
-                   ['-skip-adb-auth', '-verbose', '-show-kernel'
-                    # -ranchu fails
-                    # -memory has no effect
-                    ],
-                   False),
     '7.0': AvdInfo('Android 7.0',
                    'mozemulator-7.0',
                    'testing/config/tooltool-manifests/androidarm_7_0/mach-emulator.manifest',
                    ['-skip-adb-auth', '-verbose',
                     # does not boot if '-show-kernel' -- how strange!
                     '-ranchu',
                     '-selinux', 'permissive',
                     '-memory', '3072', '-cores', '4'],
                    False),
     'x86': AvdInfo('Android 4.2 x86',
                    'mozemulator-x86',
                    'testing/config/tooltool-manifests/androidx86/mach-emulator.manifest',
                    ['-skip-adb-auth', '-verbose', '-show-kernel',
                     '-qemu', '-m', '1024', '-enable-kvm'],
                    True),
-    'x86-6.0': AvdInfo('Android 6.0 x86',
-                       'mozemulator-x86-6.0',
-                       'testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest',
-                       ['-skip-adb-auth', '-verbose', '-show-kernel',
-                        '-ranchu',
-                        '-engine', 'qemu2',
-                        '-memory', '3072', '-cores', '4',
-                        '-qemu', '-enable-kvm'],
-                       True),
     'x86-7.0': AvdInfo('Android 7.0 x86',
                        'mozemulator-x86-7.0',
                        'testing/config/tooltool-manifests/androidx86_7_0/mach-emulator.manifest',
                        ['-skip-adb-auth', '-verbose', '-show-kernel',
                         '-ranchu',
                         '-engine', 'qemu2',
                         '-selinux', 'permissive',
                         '-memory', '3072', '-cores', '4',