Bug 1144463 - Correct execute permission of build-dolphin and update the cache path. r=wcosta

--HG--
extra : rebase_source : 925795198f0ba8a9d1c8b16b729580069650439b

testing/taskcluster/scripts/phone-builder/build-dolphin.sh

@@ -1,39 +1,6 @@
 #! /bin/bash -vex
 
-# Ensure all the scripts in this dir are on the path....
-DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-PATH=$DIRNAME:$PATH
-
-WORKSPACE=$1
-
-### Check that require variables are defined
-test -d $WORKSPACE
-test $GECKO_HEAD_REPOSITORY # Should be an hg repository url to pull from
-test $GECKO_BASE_REPOSITORY # Should be an hg repository url to clone from
-test $GECKO_HEAD_REV # Should be an hg revision to pull down
-test $MOZHARNESS_REPOSITORY # mozharness repository
-test $MOZHARNESS_REV # mozharness revision
-test $TARGET
-test $VARIANT
-
-. ../builder/setup-ccache.sh
-
-# First check if the mozharness directory is available. This is intended to be
-# used locally in development to test mozharness changes:
-#
-#   $ docker -v your_mozharness:/home/worker/mozharness ...
-#
-if [ ! -d mozharness ]; then
-  tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
-fi
-
-# Figure out where the remote manifest is so we can use caches for it.
-MANIFEST=$(repository-url.py $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV b2g/config/$TARGET/sources.xml)
-tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
-
-# Ensure symlink has been created to gecko...
-rm -f $WORKSPACE/B2G/gecko
-ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
+. pre-build.sh
 
 debug_flag=""
 if [ 0$B2G_DEBUG -ne 0 ]; then
@@ -54,6 +21,9 @@ fi
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY
 
+# Don't cache backups
+rm -rf $WORKSPACE/B2G/backup-*
+
 # Move files into artifact locations!
 mkdir -p $HOME/artifacts
 

testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml

@@ -16,7 +16,7 @@ task:
 
   payload:
     cache:
-      build-dolphin-512-eng: /home/worker/object-folder
+      build-dolphin-512-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'
       VARIANT: eng

testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml

@@ -15,6 +15,6 @@ task:
 
   payload:
     cache:
-      build-dolphin-512-opt: /home/worker/object-folder
+      build-dolphin-512-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin-512'

testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml

@@ -16,7 +16,7 @@ task:
 
   payload:
     cache:
-      build-dolphin-eng: /home/worker/object-folder
+      build-dolphin-eng: /home/worker/workspace
     env:
       TARGET: 'dolphin'
       VARIANT: eng

testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml

@@ -15,7 +15,7 @@ task:
 
   payload:
     cache:
-      build-dolphin-opt: /home/worker/object-folder
+      build-dolphin-opt: /home/worker/workspace
     env:
       TARGET: 'dolphin'