Bug 1556058 - Upgrade the emulator used for most Android 7.0 tests; r=aerickson
authorGeoff Brown <gbrown@mozilla.com>
Fri, 28 Jun 2019 17:30:15 +0000
changeset 543421 989d4fa5731b6b95952fb6babffa702d9312bd25
parent 543420 4cb7eb5b8a428f82b8db1fd60e591a3a06e142b8
child 543422 1c97fe09606795fc369569f651b157e3079ba7f5
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaerickson
bugs1556058, 1534732
milestone69.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 1556058 - Upgrade the emulator used for most Android 7.0 tests; r=aerickson Upgrade to version 29.0.11 of the emulator and use '-gpu on' rather than swiftshader_indirect, for most Android 7.0 tests. The upgrade appears to finally resolve bug 1534732, improves reftest performance dramatically, and allows us to reduce reftest "fuzz" for many tests. marionette tests are excluded because they intermittently fail with network errors (address in use); these tests are near end-of-life, so I don't think this issue is worth investigating, but I'll file a follow-up bug to record the issue. web-platform tests are excluded because they are not very stable on the existing emulator, making it difficult to compare results. I will file a follow-up and work with :maja_zf to see if they can be upgraded soon. Differential Revision: https://phabricator.services.mozilla.com/D36256
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/web-platform.yml
testing/mozharness/configs/android/androidx86_7_0-old.py
testing/mozharness/configs/android/androidx86_7_0.py
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -8,17 +8,17 @@ 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/androidx86_7_0.py
+                    - android/androidx86_7_0-old.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
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -22,17 +22,17 @@ job-defaults:
         script: web_platform_tests.py
         config:
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py
                 macosx.*:
                     - web_platform_tests/prod_config_mac.py
                 android-em.*:
-                    - android/androidx86_7_0.py
+                    - android/androidx86_7_0-old.py
                     - web_platform_tests/prod_config_android.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
     target:
         by-test-platform:
             android-em-7.0-x86_64/opt: geckoview-androidTest.apk
             android-em-7.0-x86_64/debug: geckoview-androidTest.apk
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/android/androidx86_7_0-old.py
@@ -0,0 +1,40 @@
+# mozharness configuration for Android x86/x86_64 7.0 unit tests
+#
+# This configuration should be combined with suite definitions and other
+# mozharness configuration from android_common.py, or similar.
+#
+# *** This configuration uses an emulator from an older sdk and should   ***
+# *** only be used by tests that cannot be upgraded to the new emulator. ***
+
+config = {
+    "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86_7_0/releng.manifest",
+    "emulator_manifest": """
+        [
+        {
+            "algorithm": "sha512",
+            "visibility": "internal",
+            "filename": "android-sdk_r28.0.25.0-linux-x86emu.tar.gz",
+            "unpack": true,
+            "digest": "e62acc91f41ccef65a4937a2672fcb56362e9946b806bacc25854035b57d5bd2d525a9c7d660a643ab6381ae2e3b660be7fea70e302ed314c4b07880b2328e18",
+            "size": 241459387
+        }
+        ] """,
+    "emulator_avd_name": "test-1",
+    "emulator_process_name": "emulator64-x86",
+    "emulator_extra_args": "-gpu swiftshader_indirect -skip-adb-auth -verbose -show-kernel -use-system-libs -ranchu -selinux permissive -memory 3072 -cores 4",
+    "exes": {
+        'adb': '%(abs_work_dir)s/android-sdk-linux/platform-tools/adb',
+    },
+    "env": {
+        "DISPLAY": ":0.0",
+        "PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk-linux/emulator:%(abs_work_dir)s/android-sdk-linux/tools:%(abs_work_dir)s/android-sdk-linux/platform-tools",
+        "MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps",
+        # "LIBGL_DEBUG": "verbose"
+    },
+    "marionette_extra": "--emulator",
+    "bogomips_minimum": 3000,
+    # in support of test-verify
+    "android_version": 24,
+    "is_fennec": False,
+    "is_emulator": True,
+}
--- a/testing/mozharness/configs/android/androidx86_7_0.py
+++ b/testing/mozharness/configs/android/androidx86_7_0.py
@@ -5,25 +5,25 @@
 
 config = {
     "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86_7_0/releng.manifest",
     "emulator_manifest": """
         [
         {
             "algorithm": "sha512",
             "visibility": "internal",
-            "filename": "android-sdk_r28.0.25.0-linux-x86emu.tar.gz",
+            "filename": "android-sdk_r29.0.11.0-linux-x86emu.tar.gz",
             "unpack": true,
-            "digest": "e62acc91f41ccef65a4937a2672fcb56362e9946b806bacc25854035b57d5bd2d525a9c7d660a643ab6381ae2e3b660be7fea70e302ed314c4b07880b2328e18",
-            "size": 241459387
+            "digest": "954d6c7ecf3e10468ae0ca8d97f930eb1e1665ddf5d9317dd4bb8fbc13271cf12c4e343170aee782c33f1b6e15e5915f62c9e4a2a66eb32cc0b919cd6fb9659b",
+            "size": 330652164
         }
         ] """,
     "emulator_avd_name": "test-1",
-    "emulator_process_name": "emulator64-x86",
-    "emulator_extra_args": "-gpu swiftshader_indirect -skip-adb-auth -verbose -show-kernel -use-system-libs -ranchu -selinux permissive -memory 3072 -cores 4",
+    "emulator_process_name": "qemu-system-x86_64",
+    "emulator_extra_args": "-gpu on -skip-adb-auth -verbose -show-kernel -ranchu -selinux permissive -memory 3072 -cores 4",
     "exes": {
         'adb': '%(abs_work_dir)s/android-sdk-linux/platform-tools/adb',
     },
     "env": {
         "DISPLAY": ":0.0",
         "PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk-linux/emulator:%(abs_work_dir)s/android-sdk-linux/tools:%(abs_work_dir)s/android-sdk-linux/platform-tools",
         "MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps",
         # "LIBGL_DEBUG": "verbose"