Bug 1164194: Get rid of all spark specific files. r=garndt a=garndt

Spark now can be built from main gaia repository, so we don't need to
keep specific spark build scripts. The small differences are now handled
through environment variables.

--HG--
extra : rebase_source : 7b82f8f18661222450f123e92cf7f7e5f52046a7

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

@@ -2,12 +2,10 @@
 
 . pre-build.sh
 
-if [ 0$B2G_DEBUG -ne 0 ]; then
-    DEBUG_SUFFIX=-debug
-fi
-
-if [ ! -d $HOME/.ssh ]; then
-    mkdir $HOME/.ssh
+if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
+  # caching objects might be dangerous for some devices (aka aries)
+  rm -rf $WORKSPACE/B2G/objdir*
+  rm -rf $WORKSPACE/B2G/out
 fi
 
 PLATFORM=${TARGET%%-*}
@@ -18,13 +16,21 @@ mar_file=b2g-$PLATFORM-gecko-update.mar
 # We need different platform names for each variant (user, userdebug and
 # eng). We do not append variant suffix for "user" to keep compability with
 # verions already installed in the phones.
-if [ $VARIANT != "user" ]; then
+if [ 0$DOGFOOD -ne 0 -o $VARIANT != "user" ]; then
   PLATFORM=$PLATFORM-$VARIANT
 fi
 
+if ! test $MOZHARNESS_CONFIG; then
+  MOZHARNESS_CONFIG=b2g/taskcluster-phone-ota.py
+fi
+
+if ! test $BALROG_SERVER_CONFIG; then
+  BALROG_SERVER_CONFIG=balrog/docker-worker.py
+fi
+
 ./mozharness/scripts/b2g_build.py \
-  --config b2g/taskcluster-phone-nightly.py \
-  --config balrog/docker-worker.py \
+  --config $MOZHARNESS_CONFIG \
+  --config $BALROG_SERVER_CONFIG \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \

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

@@ -2,8 +2,18 @@
 
 . pre-build.sh
 
+if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
+  # caching objects might be dangerous for some devices (aka aries)
+  rm -rf $WORKSPACE/B2G/objdir*
+  rm -rf $WORKSPACE/B2G/out
+fi
+
+if ! test $MOZHARNESS_CONFIG; then
+  MOZHARNESS_CONFIG=b2g/taskcluster-phone.py
+fi
+
 ./mozharness/scripts/b2g_build.py \
-  --config b2g/taskcluster-phone.py \
+  --config $MOZHARNESS_CONFIG \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \

testing/taskcluster/scripts/phone-builder/build-spark-ota.sh

@@ -1,70 +0,0 @@
-#!/bin/bash -vex
-
-. pre-build.sh
-
-if [ 0$B2G_DEBUG -ne 0 ]; then
-    DEBUG_SUFFIX=-debug
-fi
-
-if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
-  # caching objects might be dangerous for some devices (aka aries)
-  rm -rf $WORKSPACE/B2G/objdir*
-  rm -rf $WORKSPACE/B2G/out
-fi
-
-aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
-mar_file=b2g-${TARGET%%-*}-gecko-update.mar
-
-# We need different platform names for each variant (user, userdebug and
-# eng). We do not append variant suffix for "user" to keep compability with
-# verions already installed in the phones.
-if [ 0$DOGFOOD -ne 0 -o $VARIANT == "user" ]; then
-  PLATFORM=$TARGET
-else
-  PLATFORM=$TARGET-$VARIANT
-fi
-
-if ! test $MOZHARNESS_CONFIG; then
-  MOZHARNESS_CONFIG=b2g/taskcluster-spark-nightly.py
-fi
-
-if ! test $BALROG_SERVER_CONFIG; then
-  BALROG_SERVER_CONFIG=balrog/docker-worker.py
-fi
-
-./mozharness/scripts/b2g_lightsaber.py \
-  --config $MOZHARNESS_CONFIG \
-  --config $BALROG_SERVER_CONFIG \
-  "$debug_flag" \
-  --disable-mock \
-  --variant=$VARIANT \
-  --work-dir=$WORKSPACE/B2G \
-  --gaia-languages-file locales/languages_all.json \
-  --log-level=debug \
-  --target=$TARGET \
-  --b2g-config-dir=$TARGET \
-  --checkout-revision=$GECKO_HEAD_REV \
-  --base-repo=$GECKO_BASE_REPOSITORY \
-  --repo=$GECKO_HEAD_REPOSITORY \
-  --platform $PLATFORM \
-  --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file \
-
-# Don't cache backups
-rm -rf $WORKSPACE/B2G/backup-*
-rm -f balrog_credentials
-
-mkdir -p $HOME/artifacts
-mkdir -p $HOME/artifacts-public
-
-mv $WORKSPACE/B2G/upload-public/$mar_file $HOME/artifacts-public/
-mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
-mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
-mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
-mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
-
-if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
-  mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
-fi
-
-ccache -s
-

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

@@ -1,40 +0,0 @@
-#!/bin/bash -vex
-
-. pre-build.sh
-
-# We need different platform names for each variant (user, userdebug and
-# eng). We do not append variant suffix for "user" to keep compability with
-# verions already installed in the phones.
-if [ $VARIANT == "user" ]; then
-  PLATFORM=$TARGET
-else
-  PLATFORM=$TARGET-$VARIANT
-fi
-
-./mozharness/scripts/b2g_lightsaber.py \
-  --config b2g/taskcluster-lightsaber.py \
-  "$debug_flag" \
-  --disable-mock \
-  --variant=$VARIANT \
-  --work-dir=$WORKSPACE/B2G \
-  --gaia-languages-file locales/languages_all.json \
-  --log-level=debug \
-  --target=$TARGET \
-  --b2g-config-dir=$TARGET \
-  --checkout-revision=$GECKO_HEAD_REV \
-  --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
-
-mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
-mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
-mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
-mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
-mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
-
-ccache -s

testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml

@@ -19,11 +19,12 @@ task:
       VARIANT: eng
       GAIA_OPTIMIZE: '1'
       B2G_SYSTEM_APPS: '1'
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
     command:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-spark.sh $HOME/workspace
+        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml

@@ -11,11 +11,12 @@ task:
     env:
       TARGET: 'aries'
       DEBUG: 0
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota.py
     command:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-spark-ota.sh $HOME/workspace
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
 
   extra:
     treeherder: