Backed out changeset a9241b319f14 (bug 1177951) on request per garndt in #taskcluster

testing/taskcluster/scripts/builder/install-packages.sh

@@ -2,11 +2,26 @@
 
 gecko_dir=$1
 test -d $gecko_dir
-test -n "$TOOLTOOL_CACHE"
-test -n "$TOOLTOOL_MANIFEST"
-test -n "$TOOLTOOL_REPO"
-test -n "$TOOLTOOL_REV"
 
-tc-vcs checkout $gecko_dir/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
+if [ ! -d "$gecko_dir/gcc" ]; then
+  cd $gecko_dir
+  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/gcc.tar.xz | tar Jx
+  cd -
+fi
 
-(cd $gecko_dir; python $gecko_dir/tooltool/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ --overwrite -m $gecko_dir/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE)
+if [ ! -d "$gecko_dir/sccache" ]; then
+  cd $gecko_dir
+  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/sccache.tar.bz2 | tar jx
+  cd -
+fi
+
+# Remove cached moztt directory if it exists when a user supplied a git url/revision
+if [ ! -z $MOZTT_GIT_URL ] || [ ! -z $MOZTT_REVISION ]; then
+  echo "Removing cached moztt package"
+  rm -rf moztt
+fi
+
+moztt_url=${MOZTT_GIT_URL:=https://github.com/mozilla-b2g/moztt}
+moztt_revision=${MOZTT_REVISION:=master}
+
+tc-vcs checkout $gecko_dir/moztt $moztt_url $moztt_url $moztt_revision

testing/taskcluster/tasks/build.yml

@@ -55,8 +55,6 @@ task:
       MOZHARNESS_REPOSITORY: '{{mozharness_repository}}'
       MOZHARNESS_REV: '{{mozharness_rev}}'
       MOZHARNESS_REF: '{{mozharness_ref}}'
-      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool'
-      TOOLTOOL_REV: 'master'
 
   extra:
     index:

testing/taskcluster/tasks/builds/b2g_desktop_base.yml

@@ -9,7 +9,8 @@ task:
   payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
-      TOOLTOOL_MANIFEST: 'b2g/config/tooltool-manifests/linux64/releng.manifest'
+      MOZTT_GIT_URL: '{{moztt_git_url}}'
+      MOZTT_REVISION: '{{moztt_revision}}'
 
     command:
       - /bin/bash

testing/taskcluster/tasks/builds/mulet_linux.yml

@@ -29,7 +29,6 @@ task:
 
     env:
       MOZCONFIG: 'b2g/dev/config/mozconfigs/linux64/mulet'
-      TOOLTOOL_MANIFEST: 'b2g/dev/config/tooltool-manifests/linux64/releng.manifest'
 
     maxRunTime: 3600