Backed out changeset 1ad3c93e1e07 (bug 1624649) for wrench failure on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Thu, 16 Apr 2020 23:35:18 +0300
changeset 524487 65951cbe72774d0c2151f5d4b34c0ccbe6316ddb
parent 524486 aff8eef07d078b20be9c4b7d6dfb689998fb11fa
child 524488 fcedbbae5f5dfa5cbd39ccc3d2a4fc8e4c7b86da
push id37321
push userdluca@mozilla.com
push dateFri, 17 Apr 2020 09:38:52 +0000
treeherdermozilla-central@24537fed53e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1624649
milestone77.0a1
backs out1ad3c93e1e07ee5a22a2a19efc70928d9d2f3661
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
Backed out changeset 1ad3c93e1e07 (bug 1624649) for wrench failure on a CLOSED TREE
taskcluster/ci/test/kind.yml
taskcluster/ci/test/xpcshell.yml
taskcluster/ci/webrender/kind.yml
testing/mozharness/configs/android/androidx86_7_0.py
testing/mozharness/mozharness/mozilla/testing/android.py
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -60,16 +60,11 @@ job-defaults:
         toolchain:
             by-test-platform:
                 win.*:
                     - win32-minidump-stackwalk
                     - win32-fix-stacks
                 macosx.*:
                     - macosx64-minidump-stackwalk
                     - macosx64-fix-stacks
-                android-em-7.*:
-                    - android-sdk-linux
-                    - linux64-minidump-stackwalk
-                    - linux64-node
-                    - linux64-fix-stacks
                 default:
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -86,11 +86,10 @@ xpcshell:
                     - win64-node
                     - win32-minidump-stackwalk
                     - win32-fix-stacks
                 win.*32.*:
                     - win32-node
                     - win32-minidump-stackwalk
                     - win32-fix-stacks
                 android-em-7.*:
-                    - android-sdk-linux
                     - linux64-node
                     - linux64-minidump-stackwalk
--- a/taskcluster/ci/webrender/kind.yml
+++ b/taskcluster/ci/webrender/kind.yml
@@ -331,18 +331,16 @@ jobs:
                 MOZHARNESS_SCRIPT: android_wrench.py
                 MOZHARNESS_CONFIG: android/wrench.py
                 NEED_WINDOW_MANAGER: 'true'
         dependencies:
             webrender-wrench-android-debug: webrender-wrench-android-debug
         fetches:
             webrender-wrench-android-debug:
                 - 'wrench-debug.apk'
-                - android-sdk-linux
-                - linux64-minidump-stackwalk
         run:
             using: run-task
             tooltool-downloads: internal
             command: >-
                 export WRENCH_APK=$MOZ_FETCHES_DIR/wrench-debug.apk &&
                 export WRENCH_REFTESTS=$GECKO_PATH/gfx/wr/wrench/reftests &&
                 export MOZHARNESS_PATH=$GECKO_PATH/testing/mozharness &&
                 $GECKO_PATH/taskcluster/scripts/tester/test-linux.sh
@@ -373,18 +371,16 @@ jobs:
                 MOZHARNESS_SCRIPT: android_wrench.py
                 MOZHARNESS_CONFIG: android/wrench.py
                 NEED_WINDOW_MANAGER: 'true'
         dependencies:
             webrender-wrench-android-release: webrender-wrench-android-release
         fetches:
             webrender-wrench-android-release:
                 - 'wrench-release.apk'
-                - android-sdk-linux
-                - linux64-minidump-stackwalk
         run:
             using: run-task
             tooltool-downloads: internal
             command: >-
                 export WRENCH_APK=$MOZ_FETCHES_DIR/wrench-release.apk &&
                 export WRENCH_REFTESTS=$GECKO_PATH/gfx/wr/wrench/reftests &&
                 export MOZHARNESS_PATH=$GECKO_PATH/testing/mozharness &&
                 $GECKO_PATH/taskcluster/scripts/tester/test-linux.sh
--- a/testing/mozharness/configs/android/androidx86_7_0.py
+++ b/testing/mozharness/configs/android/androidx86_7_0.py
@@ -1,29 +1,35 @@
 # 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.
 
-import os
-
 config = {
     "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86_7_0/releng.manifest",
     "emulator_manifest": """
         [
+        {
+            "algorithm": "sha512",
+            "visibility": "internal",
+            "filename": "android-sdk_r29.2.1.0-linux-x86emu.tar.gz",
+            "unpack": true,
+            "digest": "4014389d2e0c6889edf89a714e4defbd42c2bced79eee1cce726a9b2c921c6d857723f918a9f1b7dca35b9f8d6cbfdf6b47d2934d800bdd396bf5c17ada3b827",
+            "size": 299610245
+        }
         ] """,
     "emulator_avd_name": "test-1",
     "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': '{fetches_dir}/android-sdk-linux/platform-tools/adb'.format(fetches_dir=os.environ['MOZ_FETCHES_DIR']),
+        'adb': '%(abs_work_dir)s/android-sdk-linux/platform-tools/adb',
     },
     "env": {
         "DISPLAY": ":0.0",
-        "PATH": "%(PATH)s:{fetches_dir}/android-sdk-linux/emulator:{fetches_dir}/android-sdk-linux/tools:{fetches_dir}/android-sdk-linux/platform-tools".format(fetches_dir=os.environ['MOZ_FETCHES_DIR']),
+        "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",
         # "LIBGL_DEBUG": "verbose"
     },
     "bogomips_minimum": 3000,
     # in support of test-verify
     "android_version": 24,
     "is_fennec": False,
     "is_emulator": True,
 }
--- a/testing/mozharness/mozharness/mozilla/testing/android.py
+++ b/testing/mozharness/mozharness/mozilla/testing/android.py
@@ -153,17 +153,17 @@ class AndroidMixin(object):
             env['ANDROID_AVD_HOME'] = avd_path
             self.info("Found avds at %s" % avd_path)
         else:
             self.warning("AVDs missing? Not found at %s" % avd_path)
 
         if "deprecated_sdk_path" in self.config:
             sdk_path = os.path.abspath(os.path.join(avd_home_dir, '..'))
         else:
-            sdk_path = os.path.join(os.environ['MOZ_FETCHES_DIR'], 'android-sdk-linux')
+            sdk_path = os.path.join(self.abs_dirs['abs_work_dir'], 'android-sdk-linux')
         if os.path.exists(sdk_path):
             env['ANDROID_SDK_HOME'] = sdk_path
             self.info("Found sdk at %s" % sdk_path)
         else:
             self.warning("Android sdk missing? Not found at %s" % sdk_path)
 
         if self.use_gles3:
             # enable EGL 3.0 in advancedFeatures.ini