diff --git a/taskcluster/docker/desktop-build/Dockerfile b/taskcluster/docker/desktop-build/Dockerfile index 78a3db36e226..a850b4dc1581 100755 --- a/taskcluster/docker/desktop-build/Dockerfile +++ b/taskcluster/docker/desktop-build/Dockerfile @@ -5,7 +5,6 @@ MAINTAINER Dustin J. Mitchell VOLUME /builds/worker/workspace VOLUME /builds/worker/tooltool-cache VOLUME /builds/worker/checkouts -VOLUME /builds/worker/.tc-vcs # Add build scripts; these are the entry points from the taskcluster worker, and # operate on environment variables diff --git a/taskcluster/docker/desktop1604-test/Dockerfile b/taskcluster/docker/desktop1604-test/Dockerfile index 034b2602f678..8e90a08417aa 100644 --- a/taskcluster/docker/desktop1604-test/Dockerfile +++ b/taskcluster/docker/desktop1604-test/Dockerfile @@ -62,7 +62,6 @@ COPY dot-files/pulse /builds/worker/.pulse RUN chmod +x bin/* # TODO: remove this when buildbot is gone COPY buildprops.json /builds/worker/buildprops.json -COPY tc-vcs-config.yml /etc/taskcluster-vcs.yml # TODO: remove ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /builds/worker/bin/buildbot_step @@ -73,9 +72,8 @@ RUN usermod -a -G video worker RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts -# install tc-vcs and tc-npm-cache -RUN npm install -g taskcluster-vcs@2.3.12 \ - && npm install -g taskcluster-npm-cache@1.1.14 \ +# install tc-npm-cache +RUN npm install -g taskcluster-npm-cache@1.1.14 \ && rm -rf ~/.npm ENV PATH $PATH:/builds/worker/bin diff --git a/taskcluster/docker/desktop1604-test/tc-vcs-config.yml b/taskcluster/docker/desktop1604-test/tc-vcs-config.yml deleted file mode 100644 index 25e13ee4008b..000000000000 --- a/taskcluster/docker/desktop1604-test/tc-vcs-config.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Default configuration used by the tc-vs tools these can be overridden by -# passing the config you wish to use over the command line... -git: git -hg: hg - -repoCache: - # Repo url to clone when running repo init.. - repoUrl: https://gerrit.googlesource.com/git-repo.git - # Version of repo to utilize... - repoRevision: master - # The root where all downloaded cache files are stored on the local machine... - cacheDir: '{{env.HOME}}/.tc-vcs-repo/' - # Name/prefixed used as part of the base url. - cacheName: sources/{{name}}.tar.gz - # Command used to upload the tarball - uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'" - # Large http get requests are often slower using nodes built in http layer so - # we utilize a subprocess which is responsible for fetching... - get: curl --connect-timeout 30 --speed-limit 500000 -L -o {{dest}} {{url}} - # Used to create clone tarball - compress: tar -czf {{dest}} {{source}} - # All cache urls use tar + gz this is the command used to extract those files - # downloaded by the "get" command. - extract: tar -x -z -C {{dest}} -f {{source}} - -cloneCache: - # The root where all downloaded cache files are stored on the local machine... - cacheDir: '{{env.HOME}}/.tc-vcs/' - # Command used to upload the tarball - uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'" - # Large http get requests are often slower using nodes built in http layer so - # we utilize a subprocess which is responsible for fetching... - get: curl --connect-timeout 30 --speed-limit 500000 -L -o {{dest}} {{url}} - # Used to create clone tarball - compress: tar -czf {{dest}} {{source}} - # All cache urls use tar + gz this is the command used to extract those files - # downloaded by the "get" command. - extract: tar -x -z --strip-components 1 -C {{dest}} -f {{source}} - # Name/prefixed used as part of the base url. - cacheName: clones/{{name}}.tar.gz