Bug 1492362: [mozharness] Set reasonable avds_dir values; r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D86671
This commit is contained in:
Tom Prince 2020-08-25 01:35:29 +00:00
parent 5266998a5b
commit bd8a8ba4cd
5 changed files with 3 additions and 5 deletions

View File

@ -49,7 +49,6 @@ config = {
],
"tooltool_cache": os.environ.get("TOOLTOOL_CACHE"),
"hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
"avds_dir": "/builds/worker/workspace/build/.android",
# "log_format": "%(levelname)8s - %(message)s",
"log_tbpl_level": "info",
"log_raw_level": "info",

View File

@ -15,7 +15,6 @@ config = {
"--certutil-binary=%(xre_path)s/certutil",
"--product=firefox_android",
],
"avds_dir": "/builds/worker/workspace/build/.android",
"binary_path": "/tmp",
"geckodriver": "%(abs_fetches_dir)s/geckodriver",
"hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",

View File

@ -103,7 +103,7 @@ class AndroidProfileRun(TestingMixin, BaseScript, MozbaseMixin,
dirs['abs_xre_dir'] = os.path.join(
abs_dirs['abs_work_dir'], 'hostutils')
dirs['abs_blob_upload_dir'] = '/builds/worker/artifacts/blobber_upload_dir'
dirs['abs_avds_dir'] = self.config.get("avds_dir", "/home/cltbld/.android")
dirs['abs_avds_dir'] = os.path.join(abs_dirs["abs_work_dir"], ".android")
for key in dirs.keys():
if key not in abs_dirs:

View File

@ -179,7 +179,7 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
dirs['abs_test_install_dir'], 'reftest')
dirs['abs_xpcshell_dir'] = os.path.join(
dirs['abs_test_install_dir'], 'xpcshell')
dirs['abs_avds_dir'] = self.config.get("avds_dir", "/home/cltbld/.android")
dirs['abs_avds_dir'] = os.path.join(abs_dirs["abs_work_dir"], ".android")
fetches_dir = os.environ.get('MOZ_FETCHES_DIR')
if fetches_dir:
dirs['abs_sdk_dir'] = os.path.join(fetches_dir, 'android-sdk-linux')

View File

@ -177,7 +177,7 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
if self.is_android:
dirs['abs_xre_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'hostutils')
if self.is_emulator:
dirs['abs_avds_dir'] = self.config.get('avds_dir')
dirs['abs_avds_dir'] = os.path.join(abs_dirs["abs_work_dir"], ".android")
fetches_dir = os.environ.get('MOZ_FETCHES_DIR')
if fetches_dir:
dirs['abs_sdk_dir'] = os.path.join(fetches_dir, 'android-sdk-linux')