Merge pull request mozilla#20 from gregarndt/bug_1093830

BUG 1093830 - builds need moztt package r=lightsofapollo
walac · Nov 13, 2014 · 6242393 · 6242393
2 parents f595cfb + a36aa10
commit 6242393
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 20 deletions.
diff --git a/testing/docker/builder/VERSION b/testing/docker/builder/VERSION
@@ -1 +1 @@
-0.0.18
+0.0.19
diff --git a/testing/docker/builder/bin/build-b2g-desktop.sh b/testing/docker/builder/bin/build-b2g-desktop.sh
@@ -14,14 +14,8 @@ cd $gecko_dir
 hg pull -r $REVISION $REPOSITORY;
 hg update $REVISION;
 
-### Retrieve and install latest tooltool manifest
-tooltool=/home/worker/tools/tooltool.py
-manifest=b2g/config/tooltool-manifests/linux64/releng.manifest
-tooltool_url=http://tooltool.pub.build.mozilla.org/temp-sm-stuff
-
-python $tooltool --url $tooltool_url --overwrite -m $manifest fetch -c $TOOLTOOL_CACHE
-chmod +x setup.sh
-./setup.sh
+### Install package dependencies
+. install_packages.sh
 
 ### Clone gaia
 if [ ! -d "$gaia_dir" ]; then

diff --git a/testing/docker/builder/bin/build-mulet-linux.sh b/testing/docker/builder/bin/build-mulet-linux.sh
@@ -14,14 +14,8 @@ cd $gecko_dir
 hg pull -r $REVISION $REPOSITORY;
 hg update $REVISION;
 
-### Retrieve and install latest tooltool manifest
-tooltool=/home/worker/tools/tooltool.py
-manifest=browser/config/tooltool-manifests/linux64/releng.manifest
-tooltool_url=http://tooltool.pub.build.mozilla.org/temp-sm-stuff
-
-python $tooltool --url $tooltool_url --overwrite -m $manifest fetch -c $TOOLTOOL_CACHE
-chmod +x setup.sh
-./setup.sh
+### Install package dependencies
+. install_packages.sh
 
 export MOZ_OBJDIR=$(get-objdir.py $gecko_dir)
 

diff --git a/testing/docker/builder/bin/install_packages.sh b/testing/docker/builder/bin/install_packages.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -vex
+
+if [ ! -d "gcc" ]; then
+    curl https://s3-us-west-2.amazonaws.com/test-caching/packages/gcc.tar.xz | tar Jx
+fi
+
+if [ ! -d "sccache" ]; then
+    curl https://s3-us-west-2.amazonaws.com/test-caching/packages/sccache.tar.bz2 | tar jx
+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
+
+if [ ! -d "moztt" ]; then
+    moztt_url=${MOZTT_GIT_URL:=https://github.com/mozilla-b2g/moztt}
+    moztt_revision=${MOZTT_REVISION:=master}
+    git clone $moztt_url moztt
+    cd moztt && git checkout $moztt_revision
+    echo "moztt repository: $moztt_url"
+    echo "moztt revision: $(git rev-parse HEAD)"
+    cd $gecko_dir
+fi
+
diff --git a/testing/docker/builder/system-setup.sh b/testing/docker/builder/system-setup.sh
@@ -7,9 +7,6 @@ tools_dir="/tmp/tools"
 
 mkdir -p $home/bin
 mkdir -p $home/tools
-mkdir -p $home/tools/tooltool-cache
-
-wget -O $home/tools/tooltool.py https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
 
 chown -R worker:worker $home/* $home/.*
 

diff --git a/testing/taskcluster/tasks/builds/b2g_desktop.yml b/testing/taskcluster/tasks/builds/b2g_desktop.yml
@@ -27,6 +27,8 @@ task:
       # revision/project params defined originally here https://github.com/taskcluster/taskcluster-try/blob/master/try/instantiate.js
       REVISION: '{{revision}}'
       REPOSITORY: '{{repository}}'
+      MOZTT_GIT_URL: '{{moztt_git_url}}'
+      MOZTT_REVISION: '{{moztt_revision}}'
 
     image: '{{#docker_image}}builder{{/docker_image}}'
     maxRunTime: 3600

diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
@@ -27,6 +27,8 @@ task:
       # revision/project params defined originally here https://github.com/taskcluster/taskcluster-try/blob/master/try/instantiate.js
       REVISION: '{{revision}}'
       REPOSITORY: '{{repository}}'
+      MOZTT_GIT_URL: '{{moztt_git_url}}'
+      MOZTT_REVISION: '{{moztt_revision}}'
 
     image: '{{#docker_image}}builder{{/docker_image}}'
     maxRunTime: 3600

diff --git a/testing/taskcluster/tasks/builds/mulet_linux.yml b/testing/taskcluster/tasks/builds/mulet_linux.yml
@@ -27,6 +27,8 @@ task:
       # revision/project params defined originally here https://github.com/taskcluster/taskcluster-try/blob/master/try/instantiate.js
       REVISION: '{{revision}}'
       REPOSITORY: '{{repository}}'
+      MOZTT_GIT_URL: '{{moztt_git_url}}'
+      MOZTT_REVISION: '{{moztt_revision}}'
 
     image: '{{#docker_image}}builder{{/docker_image}}'
     maxRunTime: 3600