Bug 1182116: Make engineering builds official style. r=garndt

testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml

@@ -1,10 +1,9 @@
 $inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'aries-eng'
     build_type: 'opt'
 task:
-  workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-aries-eng'
   metadata:
@@ -15,16 +14,7 @@ task:
       build-aries-eng: /home/worker/workspace
     env:
       TARGET: 'aries'
-      DEBUG: 0
-      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-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production

testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml

@@ -1,10 +1,9 @@
 $inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'flame-kk-eng'
     build_type: 'opt'
 task:
-  workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-flame-kk-eng'
   metadata:
@@ -15,15 +14,6 @@ task:
       build-flame-kk-eng: /home/worker/workspace
     env:
       TARGET: 'flame-kk'
-      DEBUG: 0
-      VARIANT: eng
-      GAIA_OPTIMIZE: '1'
-      B2G_SYSTEM_APPS: '1'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production

testing/taskcluster/tasks/builds/b2g_flame_kk_eng_blobfree.yml

@@ -1,10 +1,9 @@
 $inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'flame-kk-eng-blobfree'
     build_type: 'opt'
 task:
-  workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-flame-kk-eng-blobfree'
   metadata:
@@ -15,16 +14,7 @@ task:
       build-flame-kk-eng-blobfree: /home/worker/workspace
     env:
       TARGET: 'flame-kk'
-      DEBUG: 0
-      VARIANT: eng
-      GAIA_OPTIMIZE: '1'
-      B2G_SYSTEM_APPS: '1'
       MOZHARNESS_CONFIG: b2g/taskcluster-phone-blobfree.py
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - staging

testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml

@@ -1,10 +1,9 @@
 $inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'flame-kk-spark-eng'
     build_type: 'opt'
 task:
-  workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-flame-kk-spark-eng'
   metadata:
@@ -15,16 +14,7 @@ task:
       build-flame-kk-spark-eng: /home/worker/workspace
     env:
       TARGET: 'flame-kk'
-      DEBUG: 0
-      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-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - staging

testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml

@@ -0,0 +1,22 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+task:
+  workerType: flame-kk
+
+  payload:
+    env:
+      DEBUG: 0
+      VARIANT: eng
+      GAIA_OPTIMIZE: '1'
+      B2G_SYSTEM_APPS: '1'
+      MOZILLA_OFFICIAL: '1'
+      MOZ_TELEMETRY_REPORTING: '1'
+      MOZ_CRASHREPORTER_NO_REPORT: '1'
+      GAIA_KEYBOARD_LAYOUTS: 'en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak'
+      B2G_UPDATER: '1'
+      B2G_UPDATE_CHANNEL: 'default'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone.sh $HOME/workspace