Backed out 4 changesets (bug 1492362) for gecko decision bustage. CLOSED TREE

Backed out changeset 8e6cf79c70f7 (bug 1492362)
Backed out changeset 225a6bfe8cbf (bug 1492362)
Backed out changeset ea667ccd4b19 (bug 1492362)
Backed out changeset a20562dbfece (bug 1492362)

taskcluster/ci/source-test/jsshell.yml

@@ -26,6 +26,7 @@ job-defaults:
         tier: 2
     run:
         using: mach
+        workdir: /home/cltbld
         mach: jsshell-bench --perfherder={shell} --binary=$MOZ_FETCHES_DIR/$JSSHELL {test}
     run-on-projects:
         by-shell:

taskcluster/ci/test/browsertime-desktop.yml

@@ -9,6 +9,7 @@ job-defaults:
             .*-ref-hw-2017/.*: 3600
             default: 1800
     suite: raptor
+    workdir: /home/cltbld
     run-on-projects:
         by-test-platform:
             linux.*shippable[^-qr].*: ['mozilla-central']

taskcluster/ci/test/browsertime-mobile.yml

@@ -5,6 +5,7 @@
 job-defaults:
     max-run-time: 3600
     suite: raptor
+    workdir: /builds/worker
     run-on-projects:
         by-app:
             refbrow: []

taskcluster/ci/test/raptor-chrome.yml

@@ -9,6 +9,7 @@ job-defaults:
             .*-ux/.*: 2400
             default: 1800
     suite: raptor
+    workdir: /home/cltbld
     run-on-projects: []
     tier: 2
     virtualization:

taskcluster/ci/test/raptor-chromium.yml

@@ -9,6 +9,7 @@ job-defaults:
             .*-ux/.*: 2400
             default: 1800
     suite: raptor
+    workdir: /home/cltbld
     run-on-projects: []
     tier: 2
     virtualization:

taskcluster/ci/test/raptor-fenix.yml

@@ -5,6 +5,7 @@
 job-defaults:
     max-run-time: 1800
     suite: raptor
+    workdir: /builds/worker
     run-on-projects: []
     tier: 1
     target:

taskcluster/ci/test/raptor-fennec68.yml

@@ -5,6 +5,7 @@
 job-defaults:
     max-run-time: 2700
     suite: raptor
+    workdir: /builds/worker
     run-on-projects: []
     tier: 2
     target:

taskcluster/ci/test/raptor-gve.yml

@@ -5,6 +5,7 @@
 job-defaults:
     max-run-time: 1800
     suite: raptor
+    workdir: /builds/worker
     run-on-projects:
         by-test-name:
             raptor-tp6m-.*-cold:

taskcluster/ci/test/raptor-refbrow.yml

@@ -1,9 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 job-defaults:
     max-run-time: 1800
     suite: raptor
+    workdir: /builds/worker
     run-on-projects: []
     tier: 2
     target:

taskcluster/ci/test/raptor.yml

@@ -16,6 +16,7 @@ job-defaults:
                     .*-ux/.*: 2400
                     default: 1800
     suite: raptor
+    workdir: /home/cltbld
     run-on-projects:
         by-app:
             firefox:

taskcluster/scripts/run-task

@@ -967,6 +967,11 @@ def main(args):
             else:
                 resource_process.terminate()
             resource_process.wait()
+        fetches_dir = os.environ.get('MOZ_FETCHES_DIR')
+        if fetches_dir and os.path.isdir(fetches_dir):
+            print_line(b'fetches', b'removing %s\n' % fetches_dir.encode('utf-8'))
+            shutil.rmtree(fetches_dir)
+            print_line(b'fetches', b'finished\n')
 
 
 if __name__ == '__main__':

taskcluster/taskgraph/transforms/job/__init__.py

@@ -351,8 +351,8 @@ def make_task_description(config, jobs):
     import_sibling_modules(exceptions=('common.py',))
 
     for job in jobs:
-        # only docker-worker uses a fixed absolute path to find directories
+        # always-optimized tasks never execute, so have no workdir
-        if job['worker']['implementation'] == 'docker-worker':
+        if job['run']['using'] != 'always-optimized':
             job['run'].setdefault('workdir', '/builds/worker')
 
         taskdesc = copy.deepcopy(job)

taskcluster/taskgraph/transforms/job/common.py

@@ -84,21 +84,20 @@ def support_vcs_checkout(config, job, taskdesc, sparse=False):
     is_mac = worker['os'] == 'macosx'
     is_win = worker['os'] == 'windows'
     is_linux = worker['os'] == 'linux' or 'linux-bitbar'
-    is_docker = worker['implementation'] == 'docker-worker'
     assert is_mac or is_win or is_linux
 
     if is_win:
         checkoutdir = './build'
         geckodir = '{}/src'.format(checkoutdir)
         hgstore = 'y:/hg-shared'
-    elif is_docker:
+    elif is_mac:
-        checkoutdir = '{workdir}/checkouts'.format(**job['run'])
-        geckodir = '{}/gecko'.format(checkoutdir)
-        hgstore = '{}/hg-store'.format(checkoutdir)
-    else:
         checkoutdir = './checkouts'
         geckodir = '{}/gecko'.format(checkoutdir)
         hgstore = '{}/hg-shared'.format(checkoutdir)
+    else:
+        checkoutdir = '{workdir}/checkouts'.format(**job['run'])
+        geckodir = '{}/gecko'.format(checkoutdir)
+        hgstore = '{}/hg-store'.format(checkoutdir)
 
     cache_name = 'checkouts'
 

taskcluster/taskgraph/transforms/job/hazard.py

@@ -38,7 +38,7 @@ haz_run_schema = Schema({
     Optional('secrets'): Any(bool, [text_type]),
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 

taskcluster/taskgraph/transforms/job/mach.py

@@ -30,7 +30,7 @@ mach_schema = Schema({
     Required('comm-checkout'): bool,
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 

taskcluster/taskgraph/transforms/job/mozharness.py

@@ -117,7 +117,7 @@ mozharness_run_schema = Schema({
     Required('comm-checkout'): bool,
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 

taskcluster/taskgraph/transforms/job/mozharness_test.py

@@ -10,7 +10,7 @@ import re
 
 import six
 from six import text_type
-from voluptuous import Required, Optional
+from voluptuous import Required
 
 from taskgraph.util.taskcluster import get_artifact_url
 from taskgraph.transforms.job import (
@@ -50,7 +50,7 @@ mozharness_test_run_schema = Schema({
     Required('using'): 'mozharness-test',
     Required('test'): test_description_schema,
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 
@@ -215,6 +215,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
 
 @run_job_using('generic-worker', 'mozharness-test', schema=mozharness_test_run_schema)
 def mozharness_test_on_generic_worker(config, job, taskdesc):
+    run = job['run']
     test = taskdesc['run']['test']
     mozharness = test['mozharness']
     worker = taskdesc['worker'] = job['worker']
@@ -405,6 +406,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
         }]
 
     job['run'] = {
+        'workdir': run['workdir'],
         'tooltool-downloads': mozharness['tooltool-downloads'],
         'checkout': test['checkout'],
         'command': mh_command,

taskcluster/taskgraph/transforms/job/python_test.py

@@ -10,7 +10,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 from six import text_type
 from taskgraph.transforms.job import run_job_using, configure_taskdesc_for_run
 from taskgraph.util.schema import Schema
-from voluptuous import Required, Optional
+from voluptuous import Required
 
 python_test_schema = Schema({
     Required('using'): 'python-test',
@@ -22,7 +22,7 @@ python_test_schema = Schema({
     Required('subsuite'): text_type,
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 

taskcluster/taskgraph/transforms/job/run_task.py

@@ -54,7 +54,7 @@ run_task_schema = Schema({
     Required('command'): Any([taskref_or_string], taskref_or_string),
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 
     # If not false, tooltool downloads will be enabled via relengAPIProxy
     # for either just public files, or all files. Only supported on

taskcluster/taskgraph/transforms/job/spidermonkey.py

@@ -29,7 +29,7 @@ sm_run_schema = Schema({
     Optional('spidermonkey-platform'): text_type,
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 
     Required('tooltool-downloads'): Any(
         False,

taskcluster/taskgraph/transforms/job/toolchain.py

@@ -68,7 +68,7 @@ toolchain_run_schema = Schema({
     ): text_type,
 
     # Base work directory used to set up the task.
-    Optional('workdir'): text_type,
+    Required('workdir'): text_type,
 })
 
 

testing/mozharness/configs/android/android_common.py

@@ -49,6 +49,7 @@ 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",

testing/mozharness/configs/web_platform_tests/prod_config_android.py

@@ -15,6 +15,7 @@ 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",

testing/mozharness/scripts/android_emulator_pgo.py

@@ -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'] = os.path.join(abs_dirs["abs_work_dir"], ".android")
+        dirs['abs_avds_dir'] = self.config.get("avds_dir", "/home/cltbld/.android")
 
         for key in dirs.keys():
             if key not in abs_dirs:

testing/mozharness/scripts/android_emulator_unittest.py

@@ -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'] = os.path.join(abs_dirs["abs_work_dir"], ".android")
+        dirs['abs_avds_dir'] = self.config.get("avds_dir", "/home/cltbld/.android")
         fetches_dir = os.environ.get('MOZ_FETCHES_DIR')
         if fetches_dir:
             dirs['abs_sdk_dir'] = os.path.join(fetches_dir, 'android-sdk-linux')