Backed out changeset 1ad3c93e1e07 (bug 1624649) for wrench failure on a CLOSED TREE

taskcluster/ci/test/kind.yml

@@ -65,11 +65,6 @@ job-defaults:
                 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

taskcluster/ci/test/xpcshell.yml

@@ -91,6 +91,5 @@ xpcshell:
                     - win32-minidump-stackwalk
                     - win32-fix-stacks
                 android-em-7.*:
-                    - android-sdk-linux
                     - linux64-node
                     - linux64-minidump-stackwalk

taskcluster/ci/webrender/kind.yml

@@ -336,8 +336,6 @@ jobs:
         fetches:
             webrender-wrench-android-debug:
                 - 'wrench-debug.apk'
-                - android-sdk-linux
-                - linux64-minidump-stackwalk
         run:
             using: run-task
             tooltool-downloads: internal
@@ -378,8 +376,6 @@ jobs:
         fetches:
             webrender-wrench-android-release:
                 - 'wrench-release.apk'
-                - android-sdk-linux
-                - linux64-minidump-stackwalk
         run:
             using: run-task
             tooltool-downloads: internal

testing/mozharness/configs/android/androidx86_7_0.py

@@ -3,22 +3,28 @@
 # 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,

testing/mozharness/mozharness/mozilla/testing/android.py

@@ -158,7 +158,7 @@ class AndroidMixin(object):
         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)