Bug 1409260 - Remove tc-vcs caches. r=dustin,gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 17 Oct 2017 15:12:18 +0900
changeset 440008 915021e13b67b4497111483a74d8fd212828cea9
parent 440007 b445d6f3372f548b1cd20ca5636b4389ea54d980
child 440009 afb002c9c180357782f97d5ec0edacf552071dc6
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin, gps
bugs1409260
milestone58.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 1409260 - Remove tc-vcs caches. r=dustin,gps
taskcluster/ci/toolchain/linux.yml
taskcluster/docs/caches.rst
taskcluster/taskgraph/transforms/job/common.py
taskcluster/taskgraph/transforms/job/toolchain.py
taskcluster/taskgraph/transforms/marionette_harness.py
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -258,17 +258,16 @@ linux64-android-sdk-linux-repack:
         max-run-time: 36000
         artifacts:
           - name: project/gecko/android-sdk
             path: /builds/worker/project/gecko/android-sdk/
             type: directory
     run:
         using: toolchain-script
         script: repack-android-sdk-linux.sh
-        tc-vcs: false
         resources:
             - 'python/mozboot/**/*android*'
         toolchain-artifact: project/gecko/android-sdk/android-sdk-linux.tar.xz
         toolchain-alias: android-sdk-linux
 
 linux64-android-gradle-dependencies:
     description: "Android Gradle dependencies toolchain task"
     treeherder:
@@ -281,18 +280,16 @@ linux64-android-gradle-dependencies:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-online"
         max-run-time: 36000
     run:
         using: toolchain-script
         script: android-gradle-dependencies.sh
         sparse-profile: null
-
-        tc-vcs: false
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
             - 'taskcluster/scripts/misc/android-gradle-dependencies/**'
             - '**/*.gradle'
             - 'mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/**'
             - 'mobile/android/config/mozconfigs/common*'
         toolchain-artifact: public/build/android-gradle-dependencies.tar.xz
         toolchain-alias: android-gradle-dependencies
--- a/taskcluster/docs/caches.rst
+++ b/taskcluster/docs/caches.rst
@@ -71,20 +71,16 @@ Version Control Caches
    backwards-incompatible changes to the cache's behavior.
 
    The ``hg-store`` contains a `shared store <https://www.mercurial-scm.org/wiki/ShareExtension>`
    that is is used by ``hg robustcheckout``. If you are using ``run-task`` you
    should set the ``HG_STORE_PATH`` environment variable to point to this
    directory. If you are using ``hg robustcheckout``, pass this directory to the
    ``--sharebase`` option.
 
-``level-{{level}}-{{project}}-tc-vcs`` (deprecated)
-    This cache is used internally by ``tc-vcs``.  This tool is deprecated and
-    should be replaced with ``hg robustcheckout``.
-
 Workspace Caches
 ::::::::::::::::
 
 ``level-{{level}}-*-workspace``
    These caches (of various names typically ending with ``workspace``)
    contain state to be shared between task invocations. Use cases are
    dependent on the task.
 
--- a/taskcluster/taskgraph/transforms/job/common.py
+++ b/taskcluster/taskgraph/transforms/job/common.py
@@ -30,25 +30,16 @@ def docker_worker_add_workspace_cache(co
         'skip-untrusted': True,
     })
     if extra:
         taskdesc['worker']['caches'][-1]['name'] += '-{}'.format(
             extra
         )
 
 
-def docker_worker_add_tc_vcs_cache(config, job, taskdesc):
-    taskdesc['worker'].setdefault('caches', []).append({
-        'type': 'persistent',
-        'name': 'level-{}-{}-tc-vcs'.format(
-            config.params['level'], config.params['project']),
-        'mount-point': "/builds/worker/.tc-vcs",
-    })
-
-
 def add_public_artifacts(config, job, taskdesc, path):
     taskdesc['worker'].setdefault('artifacts', []).append({
         'name': 'public/build',
         'path': path,
         'type': 'directory',
     })
 
 
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -11,17 +11,16 @@ import hashlib
 
 from mozbuild.shellutil import quote as shell_quote
 
 from taskgraph.util.schema import Schema
 from voluptuous import Optional, Required, Any
 
 from taskgraph.transforms.job import run_job_using
 from taskgraph.transforms.job.common import (
-    docker_worker_add_tc_vcs_cache,
     docker_worker_add_gecko_vcs_env_vars,
     docker_worker_add_public_artifacts,
     docker_worker_add_tooltool,
     support_vcs_checkout,
 )
 from taskgraph.util.hash import hash_paths
 from taskgraph import GECKO
 
@@ -42,19 +41,16 @@ toolchain_run_schema = Schema({
     # If not false, tooltool downloads will be enabled via relengAPIProxy
     # for either just public files, or all files.  Not supported on Windows
     Required('tooltool-downloads', default=False): Any(
         False,
         'public',
         'internal',
     ),
 
-    # If true, tc-vcs will be enabled.  Not supported on Windows.
-    Required('tc-vcs', default=True): bool,
-
     # Sparse profile to give to checkout using `run-task`.  If given,
     # a filename in `build/sparse-profiles`.  Defaults to
     # "toolchain-build", i.e., to
     # `build/sparse-profiles/toolchain-build`.  If `None`, instructs
     # `run-task` to not use a sparse profile at all.
     Required('sparse-profile', default='toolchain-build'): Any(basestring, None),
 
     # Paths/patterns pointing to files that influence the outcome of a
@@ -125,18 +121,16 @@ def docker_worker_toolchain(config, job,
     worker['chain-of-trust'] = True
 
     # Allow the job to specify where artifacts come from, but add
     # public/build if it's not there already.
     artifacts = worker.setdefault('artifacts', [])
     if not any(artifact.get('name') == 'public/build' for artifact in artifacts):
         docker_worker_add_public_artifacts(config, job, taskdesc)
 
-    if run['tc-vcs']:
-        docker_worker_add_tc_vcs_cache(config, job, taskdesc)
     docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
     support_vcs_checkout(config, job, taskdesc, sparse=True)
 
     env = worker['env']
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
         'TOOLS_DISABLE': 'true',
--- a/taskcluster/taskgraph/transforms/marionette_harness.py
+++ b/taskcluster/taskgraph/transforms/marionette_harness.py
@@ -22,16 +22,9 @@ def setup_task(config, tasks):
             'GECKO_BASE_REPOSITORY': config.params['base_repository'],
             'GECKO_HEAD_REF': config.params['head_rev'],
             'GECKO_HEAD_REPOSITORY': config.params['head_repository'],
             'GECKO_HEAD_REV': config.params['head_rev'],
             'MOZ_BUILD_DATE': config.params['moz_build_date'],
             'MOZ_SCM_LEVEL': config.params['level'],
         })
 
-        task['worker']['caches'] = [{
-            'type': 'persistent',
-            'name': 'level-{}-{}-tc-vcs'.format(
-                config.params['level'], config.params['project']),
-            'mount-point': "/builds/worker/.tc-vcs",
-        }]
-
         yield task