Bug 1166745: Reorganize tasks.

- Rename nightly -> ota.
- Rename lightsaber -> spark.
- Add flame kk debug tasks.
- Add aries build tasks in treeherder.
- Add aries to try.
- Add fx-team and inbound tasks.
- Only run OTA build on m-c.

testing/taskcluster/mach_commands.py

@@ -45,7 +45,7 @@ TREEHERDER_ROUTES = {
 
 DEFAULT_TRY = 'try: -b do -p all -u all'
 DEFAULT_JOB_PATH = os.path.join(
-    ROOT, 'tasks', 'branches', 'mozilla-central', 'job_flags.yml'
+    ROOT, 'tasks', 'branches', 'base_jobs.yml'
 )
 
 def load_mozharness_info():

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

@@ -1,4 +1,4 @@
-#! /bin/bash -vex
+#!/bin/bash -vex
 
 . pre-build.sh
 

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

@@ -1,4 +1,4 @@
-#! /bin/bash -vex
+#!/bin/bash -vex
 
 . pre-build.sh
 

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

@@ -1,4 +1,4 @@
-#! /bin/bash -vex
+#!/bin/bash -vex
 
 # Ensure all the scripts in this dir are on the path....
 DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml

@@ -3,30 +3,5 @@
 # see <gecko>/testing/taskcluster/tasks/job_flags.yml
 
 $inherits:
-  from: tasks/branches/mozilla-central/job_flags.yml
+  from: tasks/branches/base_jobs.yml
 
-builds:
-  flame-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_opt.yml
-
-tests:
-  gaia-ui-test-sanity:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
-  gaia-ui-test-functional:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/flame_kk_gaia_ui_test_functional.yml
-  gaia-ui-test-functional-dsds:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
-  gaia-ui-test-unit:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/flame_kk_gaia_ui_test_unit.yml

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -16,14 +16,15 @@ flags:
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - macosx64_gecko # b2g desktop osx 64 bit
     - win32_gecko    # b2g desktop win 32 bit
-    - flame-kk-nightly
+    - flame-kk-ota
     - flame-kk       # b2g flame kitkat
     - flame-kk-eng   # b2g flame eng build
     - dolphin
     - dolphin-eng
     - dolphin-512
     - dolphin-512-eng
-    - aries-nightly
+    - aries
+    - aries-ota
     - aries-eng
     - android-api-11
 

testing/taskcluster/tasks/branches/base_jobs.yml

@@ -0,0 +1,180 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_job_flags.yml
+
+builds:
+  linux64_gecko:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_desktop_opt.yml
+      debug:
+        task: tasks/builds/b2g_desktop_debug.yml
+  linux64-mulet:
+    platforms:
+      - Mulet Linux
+    types:
+      opt:
+        task: tasks/builds/mulet_linux.yml
+  emulator-kk:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_kk_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_kk_debug.yml
+  emulator-l:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_l_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_l_debug.yml
+  emulator-jb:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_jb_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_jb_debug.yml
+  emulator:
+    platfoms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_emulator_ics_opt.yml
+      debug:
+        task: tasks/builds/b2g_emulator_ics_debug.yml
+  aries:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_opt.yml
+      debug:
+        task: tasks/builds/b2g_aries_spark_debug.yml
+  aries-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_eng.yml
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
+      debug:
+        task: tasks/builds/b2g_flame_kk_debug.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
+
+tests:
+  cppunit:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_cpp_unit.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_cpp_unit.yml
+  crashtest:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_crashtest.yml
+  gaia-build:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_build_test.yml
+  gaia-build-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_build_unit.yml
+  gaia-js-integration:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_js_integration_tests.yml
+  gaia-linter:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_linter.yml
+  gaia-ui-test-accessibility:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
+  gaia-ui-test-functional:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_functional.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_functional.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_functional.yml
+  gaia-ui-test-functional-dsds:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
+  gaia-ui-test-sanity:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+  gaia-ui-test-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_ui_test_unit.yml
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_ui_test_unit.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_unit.yml
+  gaia-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_gaia_unit.yml
+  marionette:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_marionette.yml
+  marionette-webapi:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_marionette_webapi.yml
+  mochitest:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_mochitest.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_mochitest.yml
+      tasks/builds/mulet_linux.yml:
+        task: tasks/tests/mulet_mochitests.yml
+  mochitest-oop:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_mochitest_oop.yml
+  reftest:
+    allowed_build_tasks:
+      tasks/builds/mulet_linux.yml:
+        task: tasks/tests/mulet_reftests.yml
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_reftest.yml
+  reftest-sanity-oop:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop_opt.yml:
+        task: tasks/tests/b2g_reftests_sanity_oop.yml
+  xpcshell:
+    allowed_build_tasks:
+      tasks/builds/b2g_emulator_ics_opt.yml:
+        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
+      tasks/builds/b2g_emulator_ics_debug.yml:
+        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml

testing/taskcluster/tasks/branches/fx-team/job_flags.yml

@@ -0,0 +1,7 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_jobs.yml
+

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

@@ -3,166 +3,22 @@
 # see <gecko>/testing/taskcluster/tasks/job_flags.yml
 
 $inherits:
-  from: tasks/branches/base_job_flags.yml
+  from: tasks/branches/base_jobs.yml
 
 builds:
-  linux64_gecko:
+  aries-ota:
     platforms:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_desktop_opt.yml
+        task: tasks/builds/b2g_aries_spark_ota_opt.yml
       debug:
-        task: tasks/builds/b2g_desktop_debug.yml
-  linux64-mulet:
-    platforms:
-      - Mulet Linux
-    types:
-      opt:
-        task: tasks/builds/mulet_linux.yml
-  emulator-kk:
-    platfoms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_kk_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_kk_debug.yml
-  emulator-l:
-    platfoms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_l_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_l_debug.yml
-  emulator-jb:
-    platfoms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_jb_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_jb_debug.yml
-  emulator:
-    platfoms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_ics_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_ics_debug.yml
-  aries-nightly:
+        task: tasks/builds/b2g_aries_spark_ota_debug.yml
+  flame-kk-ota:
     platforms:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
+        task: tasks/builds/b2g_flame_kk_ota_opt.yml
       debug:
-        task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
-  aries-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_lightsaber_eng.yml
-  flame-kk-nightly:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_nightly_opt.yml
-      debug:
-        task: tasks/builds/b2g_flame_kk_nightly_debug.yml
-  flame-kk-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_eng.yml
-
-tests:
-  cppunit:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-  crashtest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_crashtest.yml
-  gaia-build:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_build_test.yml
-  gaia-build-unit:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_build_unit.yml
-  gaia-js-integration:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-  gaia-linter:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_linter.yml
-  gaia-ui-test-accessibility:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
-      tasks/builds/b2g_desktop_debug.yml:
-        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
-  gaia-ui-test-functional:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_gaia_ui_test_functional.yml
-      tasks/builds/b2g_desktop_debug.yml:
-        task: tasks/tests/b2g_gaia_ui_test_functional.yml
-  gaia-ui-test-unit:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_gaia_ui_test_unit.yml
-      tasks/builds/b2g_desktop_debug.yml:
-        task: tasks/tests/b2g_gaia_ui_test_unit.yml
-  gaia-unit:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_gaia_unit.yml
-  marionette:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette.yml
-  marionette-webapi:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette_webapi.yml
-  mochitest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-      tasks/builds/mulet_linux.yml:
-        task: tasks/tests/mulet_mochitests.yml
-  mochitest-oop:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_mochitest_oop.yml
-  reftest:
-    allowed_build_tasks:
-      tasks/builds/mulet_linux.yml:
-        task: tasks/tests/mulet_reftests.yml
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml
-  reftest-sanity-oop:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop_opt.yml:
-        task: tasks/tests/b2g_reftests_sanity_oop.yml
-  xpcshell:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
+        task: tasks/builds/b2g_flame_kk_ota_debug.yml

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

@@ -0,0 +1,7 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_jobs.yml
+

testing/taskcluster/tasks/branches/try/job_flags.yml

@@ -64,12 +64,28 @@ builds:
         task: tasks/builds/b2g_emulator_ics_opt.yml
       debug:
         task: tasks/builds/b2g_emulator_ics_debug.yml
+  aries:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_opt.yml
+      debug:
+        task: tasks/builds/b2g_aries_spark_debug.yml
+  aries-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_eng.yml
   flame-kk:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_opt.yml
+      debug:
+        task: tasks/builds/b2g_flame_kk_debug.yml
   flame-kk-eng:
     platforms:
       - b2g

testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml

@@ -1,21 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
-  variables:
-    build_name: 'aries'
-    build_type: 'debug'
-task:
-  metadata:
-    name: '[TC] B2G Aries Nightly (userdebug)'
-  scopes:
-    - 'docker-worker:cache:build-aries-lightsaber-nightly-debug'
-  extra:
-    treeherder:
-      collection:
-        debug: true
-  payload:
-    cache:
-      build-aries-lightsaber-nightly-debug: /home/worker/workspace
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0
-

testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml

@@ -1,17 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
-  variables:
-    build_name: 'aries'
-    build_type: 'opt'
-task:
-  metadata:
-    name: '[TC] B2G Aries Nightly (user)'
-  scopes:
-    - 'docker-worker:cache:build-aries-lightsaber-nightly-user'
-
-  payload:
-    cache:
-      build-aries-lightsaber-nightly-user: /home/worker/workspace
-    env:
-      VARIANT: user
-

testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml

@@ -0,0 +1,41 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'debug'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:build-aries-debug'
+  metadata:
+    name: '[TC] B2G Aries Debug'
+
+  payload:
+    cache:
+      build-aries-debug: /home/worker/workspace
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      VARIANT: userdebug
+      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
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
+    locations:
+      img: 'private/build/aries.zip'

testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml

@@ -23,7 +23,7 @@ task:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-lightsaber.sh $HOME/workspace
+        buildbot_step 'Build' ./build-spark.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production

testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml

@@ -0,0 +1,39 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:build-aries-opt'
+  metadata:
+    name: '[TC] B2G Aries Opt'
+
+  payload:
+    cache:
+      build-aries-opt: /home/worker/workspace
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      VARIANT: user
+      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
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml

@@ -15,16 +15,10 @@ task:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-lightsaber-nightly.sh $HOME/workspace
+        buildbot_step 'Build' ./build-spark-ota.sh $HOME/workspace
 
   extra:
-    treeherderEnv:
-      - production
-      - staging
     treeherder:
-      symbol: B
-      groupSymbol: Aries
-      groupName: Aries Device Image
       machine:
         platform: b2g-device-image
     locations:

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml

@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Aries OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:build-aries-spark-ota-debug'
+  payload:
+    cache:
+      build-aries-spark-ota-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0
+

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml

@@ -0,0 +1,16 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Aries OTA (user)'
+  scopes:
+    - 'docker-worker:cache:build-aries-spark-ota-user'
+  payload:
+    cache:
+      build-aries-spark-ota-user: /home/worker/workspace
+    env:
+      VARIANT: user
+

testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml

@@ -0,0 +1,38 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'debug'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-debug'
+  metadata:
+    name: '[TC] B2G Flame KK Debug'
+
+  payload:
+    cache:
+      build-flame-kk-debug: /home/worker/workspace
+    env:
+      TARGET: 'flame-kk'
+      DEBUG: 0
+      VARIANT: userdebug
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Flame-KK
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
+    locations:
+      img: 'private/build/flame-kk.zip'

testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml

@@ -25,6 +25,9 @@ task:
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       symbol: Be
       groupSymbol: Flame-KK

testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml

@@ -1,18 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
-  variables:
-    build_name: 'flame-kk'
-    build_type: 'debug'
-task:
-  metadata:
-    name: '[TC] B2G Flame KK Nightly (userdebug)'
-  workerType: balrog
-  scopes:
-    - 'docker-worker:cache:build-flame-kk-nightly-debug'
-
-  payload:
-    cache:
-        build-flame-kk-nightly-debug: /home/worker/workspace
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml

@@ -1,17 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
-  variables:
-    build_name: 'flame-kk'
-    build_type: 'opt'
-task:
-  metadata:
-    name: '[TC] B2G Flame KK Nightly (user)'
-  workerType: balrog
-  scopes:
-    - 'docker-worker:cache:build-flame-kk-nightly-user'
-
-  payload:
-    cache:
-        build-flame-kk-nightly-user: /home/worker/workspace
-    env:
-      VARIANT: user

testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml

@@ -22,6 +22,9 @@ task:
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
+    treeherderEnv:
+      - production
+      - staging
     treeherder:
       symbol: B
       groupSymbol: Flame-KK

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml

@@ -15,13 +15,10 @@ task:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-nightly.sh $HOME/workspace
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
 
   extra:
     treeherder:
-      symbol: B
-      groupSymbol: Flame-KK
-      groupName: Flame KitKat Device Image
       machine:
         platform: b2g-device-image
     locations:

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml

@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-ota-debug'
+
+  payload:
+    cache:
+        build-flame-kk-ota-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml

@@ -0,0 +1,16 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK OTA (user)'
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-ota-user'
+
+  payload:
+    cache:
+      build-flame-kk-ota-user: /home/worker/workspace
+    env:
+      VARIANT: user