Bug 1314807 - Use vendored tooltool.py; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Wed, 02 Nov 2016 16:26:49 -0700
changeset 432851 494ac2285a29aaacfb92e9c5051f9285d2f9b2b9
parent 432850 fe2793657aed9e1264064ef1e023265b0468bc0d
child 535775 a346c4f17a04474c4dbaebf78a72f27e67cd987b
push id34448
push userbmo:gps@mozilla.com
push dateWed, 02 Nov 2016 23:27:05 +0000
reviewersdustin
bugs1314807
milestone52.0a1
Bug 1314807 - Use vendored tooltool.py; r?dustin Do not speak to github.com as part of CI. Do not open ourselves to a MitM attack. Be more deterministic. MozReview-Commit-ID: JRGbraQtqJi
taskcluster/scripts/builder/build-haz-linux.sh
--- a/taskcluster/scripts/builder/build-haz-linux.sh
+++ b/taskcluster/scripts/builder/build-haz-linux.sh
@@ -34,34 +34,32 @@ DIRNAME=$( cd "$( dirname "${BASH_SOURCE
 PATH=$DIRNAME:$PATH
 
 # Use GECKO_BASE_REPOSITORY as a signal for whether we are running in automation.
 export AUTOMATION=${GECKO_BASE_REPOSITORY:+1}
 
 : ${GECKO_DIR:=$WORKSPACE/gecko}
 : ${TOOLTOOL_MANIFEST:=browser/config/tooltool-manifests/linux64/hazard.manifest}
 : ${TOOLTOOL_CACHE:=$WORKSPACE/tt-cache}
-: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool}
 
 if ! [ -d $GECKO_DIR ]; then
     echo "GECKO_DIR must be set to a directory containing a gecko source checkout" >&2
     exit 1
 fi
 GECKO_DIR=$( cd "$GECKO_DIR" && pwd )
 
 # Directory to populate with tooltool-installed tools
 export TOOLTOOL_DIR="$WORKSPACE"
 
 # Directory to hold the (useless) object files generated by the analysis.
 export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
 mkdir -p "$MOZ_OBJDIR"
 
 if [ -n "$DO_TOOLTOOL" ]; then
-  tc-vcs checkout --force-clone $WORKSPACE/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
-  ( cd $TOOLTOOL_DIR; python $WORKSPACE/tooltool/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ -m $GECKO_DIR/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE )
+  ( cd $TOOLTOOL_DIR; python $GECKO_DIR/testing/docker/recipes/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ -m $GECKO_DIR/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE )
 fi
 
 export NO_MERCURIAL_SETUP_CHECK=1
 
 if [[ "$PROJECT" = "browser" ]]; then (
     cd "$WORKSPACE"
     set "$WORKSPACE"
     . setup-ccache.sh