merge b2g-inbound to mozilla-central a=merge

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

@@ -18,15 +18,23 @@ 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 [ $VARIANT == "user" ]; then
+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 b2g/taskcluster-lightsaber-nightly.py \
-  --config balrog/docker-worker.py \
+  --config $MOZHARNESS_CONFIG \
+  --config $BALROG_SERVER_CONFIG \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -26,6 +26,7 @@ flags:
     - aries
     - aries-ota
     - aries-eng
+    - aries-dogfood
     - android-api-11
     - linux64
 

testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml

@@ -14,6 +14,12 @@ builds:
         task: tasks/builds/b2g_aries_spark_ota_opt.yml
       debug:
         task: tasks/builds/b2g_aries_spark_ota_debug.yml
+  aries-dogfood:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_dogfood.yml
   flame-kk-ota:
     platforms:
       - b2g

testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml

@@ -0,0 +1,29 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
+  variables:
+    build_name: 'aries-dogfood'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Aries Dogfood'
+  scopes:
+    - 'docker-worker:cache:build-aries-spark-dogfood'
+  payload:
+    cache:
+      build-aries-spark-dogfood: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      DOGFOOD: 1
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries-DogFood
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true