Bug 1177951 - Use tooltool on b2g desktop and mulet taskcluster builds. r=wcosta,r=garndt
☠☠ backed out by 129fd95e3d41 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 23 Jul 2015 17:34:21 +0900
changeset 274509 a9241b319f14de5ce7ff80de13f6725e227e766c
parent 274508 a5b0d78839c0f25c4123967474597c344b7b9c66
child 274510 72b38c5bcf7328bae4a1e6e4a112c64cbecb69b9
push id8304
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 19:25:01 +0000
treeherdermozilla-aurora@7308dd0a6c3b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta, garndt
bugs1177951
milestone42.0a1
Bug 1177951 - Use tooltool on b2g desktop and mulet taskcluster builds. r=wcosta,r=garndt
testing/taskcluster/scripts/builder/install-packages.sh
testing/taskcluster/tasks/build.yml
testing/taskcluster/tasks/builds/b2g_desktop_base.yml
testing/taskcluster/tasks/builds/mulet_linux.yml
--- a/testing/taskcluster/scripts/builder/install-packages.sh
+++ b/testing/taskcluster/scripts/builder/install-packages.sh
@@ -1,27 +1,12 @@
 #!/bin/bash -vex
 
 gecko_dir=$1
 test -d $gecko_dir
-
-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
+test -n "$TOOLTOOL_CACHE"
+test -n "$TOOLTOOL_MANIFEST"
+test -n "$TOOLTOOL_REPO"
+test -n "$TOOLTOOL_REV"
 
-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
+tc-vcs checkout $gecko_dir/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
 
-# 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
+(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)
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -50,16 +50,18 @@ task:
       # Common environment variables for checking out gecko
       GECKO_BASE_REPOSITORY: '{{base_repository}}'
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
       GECKO_HEAD_REV: '{{head_rev}}'
       GECKO_HEAD_REF: '{{head_ref}}'
       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:
       rank: {{pushlog_id}}
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster
       symbol: B
--- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
@@ -4,18 +4,17 @@ task:
   metadata:
     name: "[TC] B2G Desktop ( {{build_type}} )"
     description: B2G Desktop {{build_type}}
 
   workerType: b2gbuild-desktop
   payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
-      MOZTT_GIT_URL: '{{moztt_git_url}}'
-      MOZTT_REVISION: '{{moztt_revision}}'
+      TOOLTOOL_MANIFEST: 'b2g/config/tooltool-manifests/linux64/releng.manifest'
 
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
         buildbot_step 'Build' ./build-b2g-desktop.sh $HOME/workspace
--- a/testing/taskcluster/tasks/builds/mulet_linux.yml
+++ b/testing/taskcluster/tasks/builds/mulet_linux.yml
@@ -24,16 +24,17 @@ task:
       build-mulet-linux-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tools/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       MOZCONFIG: 'b2g/dev/config/mozconfigs/linux64/mulet'
+      TOOLTOOL_MANIFEST: 'b2g/dev/config/tooltool-manifests/linux64/releng.manifest'
 
     maxRunTime: 3600
 
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&