Bug 1255644: Remove most of the taskcluster phone builds. r=selenamarie
authorWander Lairson Costa <wcosta@mozilla.com>
Mon, 21 Mar 2016 07:01:27 -0300
changeset 331468 f66903f5f06f6b2a82a0b74d531861bd11b70931
parent 331467 f282fae537d7783faf8f9b335fd0ffab633914c6
child 331469 7418601ca4f6c6cc59c70033499a04a9c4652bac
push id1146
push userCallek@gmail.com
push dateMon, 25 Jul 2016 16:35:44 +0000
treeherdermozilla-release@a55778f9cd5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersselenamarie
bugs1255644
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1255644: Remove most of the taskcluster phone builds. r=selenamarie As B2G has been moved to Tier 3, we are turning phone builds off. Only nexus-5l-eng, aries-eng and aries-debug remain.
testing/taskcluster/tasks/branches/b2g-ota/job_flags.yml
testing/taskcluster/tasks/branches/base_job_flags.yml
testing/taskcluster/tasks/branches/base_jobs.yml
testing/taskcluster/tasks/branches/mozilla-b2g44_v2_5/job_flags.yml
testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
testing/taskcluster/tasks/branches/try/job_flags.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_noril_opt.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml
testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml
testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml
testing/taskcluster/tasks/builds/b2g_dolphin_base.yml
testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml
testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml
testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml
testing/taskcluster/tasks/builds/b2g_hamachi_user.yml
testing/taskcluster/tasks/builds/b2g_helix_user.yml
testing/taskcluster/tasks/builds/b2g_nexus_4_kk_eng.yml
testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
testing/taskcluster/tasks/builds/b2g_nexus_4_kk_user.yml
testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_dogfood.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_noril_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_base.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_dolphin_base.yml
testing/taskcluster/tasks/builds/legacy/b2g_dolphin_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_dolphin_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_base.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_opt.yml
testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_spark_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_hamachi_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_hamachi_user.yml
testing/taskcluster/tasks/builds/legacy/b2g_helix_user.yml
testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_eng.yml
testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_ota_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_user.yml
testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_ota_debug.yml
testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_user.yml
deleted file mode 100644
--- a/testing/taskcluster/tasks/branches/b2g-ota/job_flags.yml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-# For complete sample of all build and test jobs,
-# see <gecko>/testing/taskcluster/tasks/branches/base_job_flags.yml
-
-$inherits:
-  from: tasks/branches/base_job_flags.yml
-
-builds:
-  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_eng.yml
-  aries-dogfood:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_dogfood.yml
-        additional-parameters:
-          b2g_update_channel: 'b2g-ota'
-  aries-ota:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_ota_opt.yml
-        additional-parameters:
-          b2g_update_channel: 'b2g-ota'
-      debug:
-        task: tasks/builds/b2g_aries_spark_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'b2g-ota'
-  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
-  flame-kk-spark-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_spark_eng.yml
-  flame-kk-ota:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_ota_opt.yml
-        additional-parameters:
-          b2g_update_channel: 'b2g-ota'
-      debug:
-        task: tasks/builds/b2g_flame_kk_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'b2g-ota'
-
-tests: []
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -77,35 +77,19 @@ flags:
     - emulator-x86-kk
     - emulator-l
     - linux32_gecko  # b2g desktop linux 32 bit
     - linux64_gecko  # b2g desktop linux 64 bit
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - linux64-mulet-haz  # Firefox desktop - b2g gecko linux 64 bit, rooting hazard analysis
     - macosx64_gecko # b2g desktop osx 64 bit
     - win32_gecko    # b2g desktop win 32 bit
-    - flame-kk       # b2g flame kitkat
-    - flame-kk-eng   # b2g flame eng build
-    - flame-kk-spark-eng
-    - flame-kk-ota
-    - nexus-4-kk
-    - nexus-4-kk-ota
-    - nexus-4-kk-eng
-    - nexus-5l
-    - nexus-5l-ota
     - nexus-5l-eng
-    - dolphin
-    - dolphin-eng
-    - dolphin-512
-    - dolphin-512-eng
     - aries
-    - aries-ota
     - aries-eng
-    - aries-dogfood
-    - aries-noril
     - android-api-15
     - android-api-15-frontend
     - android-partner-sample1
     - android-b2gdroid
     - linux
     - linux64
     - linux64-st-an
     - macosx64
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -51,70 +51,24 @@ builds:
       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_eng.yml
-  aries-noril:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_noril_opt.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
-  flame-kk-spark-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_spark_eng.yml
-  nexus-4-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_nexus_4_kk_user.yml
-  nexus-4-kk-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_nexus_4_kk_eng.yml
-  nexus-5l:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_nexus_5l_user.yml
   nexus-5l-eng:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_nexus_5l_eng.yml
   linux:
     platforms:
deleted file mode 100644
--- a/testing/taskcluster/tasks/branches/mozilla-b2g44_v2_5/job_flags.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-# For complete sample of all build and test jobs,
-# see <gecko>/testing/taskcluster/tasks/branches/base_job_flags.yml
-
-$inherits:
-  from: tasks/branches/base_job_flags.yml
-
-builds:
-  aries-dogfood:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_dogfood.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly-b2g44'
-  flame-kk-ota:
-    platforms:
-      - b2g
-    types:
-      debug:
-        task: tasks/builds/b2g_flame_kk_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly-b2g44'
-  nexus-4-kk-ota:
-    platforms:
-      - b2g
-    types:
-      debug:
-        task: tasks/builds/b2g_nexus_4_kk_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly-b2g44'
-  nexus-5l-ota:
-    platforms:
-      - b2g
-    types:
-      debug:
-        task: tasks/builds/b2g_nexus_5l_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly-b2g44'
-
-post-build:
-  simulator:
-    allowed_build_tasks:
-      - tasks/builds/mulet_linux.yml
-    task: tasks/post-builds/mulet_simulator.yml
-
-# Just needed for parser sake
-tests: []
--- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
@@ -12,46 +12,14 @@ flags:
 
 builds:
   android-api-15:
     platforms:
       - Android
     types:
       opt:
         task: tasks/builds/android_api_15.yml
-  aries-dogfood:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_dogfood.yml
-        additional-parameters:
-          b2g_update_channel: 'dogfood'
-  aries-ota:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly'
-      debug:
-        task: tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly'
-  flame-kk-ota:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_ota_opt.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly'
-      debug:
-        task: tasks/builds/b2g_flame_kk_ota_debug.yml
-        additional-parameters:
-          b2g_update_channel: 'nightly'
 
 post-build:
   simulator:
     allowed_build_tasks:
       - tasks/builds/mulet_linux.yml
     task: tasks/post-builds/mulet_simulator.yml
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -12,40 +12,16 @@ flags:
 
 builds:
   emulator-x86-l:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_emulator_x86_l_opt.yml
-  dolphin:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_dolphin_opt.yml
-  dolphin-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_dolphin_eng.yml
-  dolphin-512:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_dolphin_512_opt.yml
-  dolphin-512-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_dolphin_512_eng.yml
   android-api-15:
     platforms:
       - Android
     types:
       opt:
         task: tasks/builds/android_api_15.yml
   android-partner-sample1:
     platforms:
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-$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:level-{{level}}-{{project}}-build-aries-spark-dogfood'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko'
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-aries-spark-dogfood: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: userdebug
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Aries-DogFood
-      groupName: Aries Device Image
-      machine:
-        platform: b2g-device-image
-      collection:
-        debug: true
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_noril_opt.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'aries-noril'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Aries No RIL Opt'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'aries'
-      DEBUG: 0
-      VARIANT: user
-      GAIA_OPTIMIZE: '1'
-      B2G_SYSTEM_APPS: '1'
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
-      GECKO_CONFIGURE_ARGS: "--disable-b2g-ril"
-    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: Bnr
-      groupSymbol: Aries
-      groupName: Aries Device Image
-      tier: 2
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/aries.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'aries'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Aries Opt'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
-    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'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_spark_ota_debug.yml'
-task:
-  payload:
-    env:
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_spark_ota_opt.yml'
-task:
-  payload:
-    env:
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-task:
-  workerType: flame-kk
-
-  payload:
-    env:
-      TARGET: 'aries'
-      DEBUG: 0
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota.py
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
-
-  extra:
-    treeherder:
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/aries.zip'
-      mar: 'public/build/b2g-aries-gecko-update.mar'
-
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
-  variables:
-    build_name: 'aries-ota'
-    build_type: 'debug'
-task:
-  metadata:
-    name: '[TC] B2G Aries OTA (userdebug)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko'
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-aries-spark-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Aries-Spark-OTA
-      groupName:  Aries Device Image
-      machine:
-        platform: b2g-device-image
-      collection:
-        debug: true
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
-  variables:
-    build_name: 'aries-ota'
-    build_type: 'opt'
-task:
-  metadata:
-    name: '[TC] B2G Aries OTA (user)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko'
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-aries-spark-ota-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: user
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Aries-Spark-OTA
-      groupName:  Aries Device Image
-      machine:
-        platform: b2g-device-image
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_dolphin_base.yml'
-  variables:
-    build_name: 'dolphin-512-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-eng'
-  metadata:
-    name: '[TC] B2G Dolphin 512 Eng'
-
-  extra:
-    treeherder:
-      symbol: Be
-      groupSymbol: Dolphin-512
-      groupName: Dolphin 512 Device Image
-      machine:
-        platform: b2g-device-image
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-dolphin-512-eng: /home/worker/workspace
-    env:
-      TARGET: 'dolphin-512'
-      VARIANT: eng
-
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_dolphin_base.yml'
-  variables:
-    build_name: 'dolphin-512'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-opt'
-  metadata:
-    name: '[TC] B2G Dolphin 512 Opt'
-
-  extra:
-    treeherder:
-      groupSymbol: Dolphin-512
-      groupName: Dolphin 512 Device Image
-      machine:
-        platform: b2g-device-image
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-dolphin-512-opt: /home/worker/workspace
-    env:
-      TARGET: 'dolphin-512'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_base.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-$inherits:
-  from: 'tasks/phone_build.yml'
-task:
-  workerType: dolphin
-  metadata:
-    description: |
-      Dolphin phones + b2g environment used in full stack testing.
-  payload:
-    env:
-      REPO_TRACE: 1
-      VARIANT: user
-      DEBUG: 0
-
-    # Dolphin could take more than one hours to build!
-    maxRunTime: 7200
-
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-dolphin.sh $HOME/workspace
-
-  extra:
-    # Rather then enforcing particular conventions we require that all build
-    # tasks provide the "build" extra field to specify where the build and tests
-    # files are located.
-    locations:
-      build: 'private/build/b2g-android-arm.tar.gz'
-      tests: 'private/build/gaia.zip'
-      symbols: 'private/build/b2g-crashreporter-symbols.zip'
-      sources: 'private/build/sources.xml'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_dolphin_base.yml'
-  variables:
-    build_name: 'dolphin-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-eng'
-  metadata:
-    name: '[TC] B2G Dolphin Eng'
-
-  extra:
-    treeherder:
-      symbol: Be
-      groupSymbol: Dolphin
-      groupName: Dolphin Device Image
-      machine:
-        platform: b2g-device-image
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-dolphin-eng: /home/worker/workspace
-    env:
-      TARGET: 'dolphin'
-      VARIANT: eng
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_dolphin_base.yml'
-  variables:
-    build_name: 'dolphin'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-opt'
-  metadata:
-    name: '[TC] B2G Dolphin Opt'
-
-  extra:
-    treeherder:
-      groupSymbol: Dolphin
-      groupName: Dolphin Device Image
-      machine:
-        platform: b2g-device-image
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-dolphin-opt: /home/worker/workspace
-    env:
-      TARGET: 'dolphin'
-
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'flame-kk'
-    build_type: 'debug'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Flame KK Debug'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko: /home/worker/objdir-gecko
-    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'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_eng_base.yml'
-  variables:
-    build_name: 'flame-kk-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Flame KK Eng'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'flame-kk'
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      symbol: Be
-      groupSymbol: Flame-KK
-      groupName: Flame KitKat Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/flame-kk.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'flame-kk'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Flame KK Opt'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'flame-kk'
-      DEBUG: 0
-    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
-    locations:
-      img: 'private/build/flame-kk.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-task:
-  workerType: flame-kk
-  payload:
-    env:
-      TARGET: 'flame-kk'
-      DEBUG: 0
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
-
-  extra:
-    locations:
-      img: 'private/build/flame-kk.zip'
-      mar: 'public/build/b2g-flame-gecko-update.mar'
-
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
-  variables:
-    build_name: 'flame-kk-ota'
-    build_type: 'debug'
-task:
-  metadata:
-    name: '[TC] B2G Flame KK OTA (userdebug)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0
-      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Flame-KK-OTA
-      groupName:  Flame KitKat Device Image
-      machine:
-        platform: b2g-device-image
-      collection:
-        debug: true
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
-  variables:
-    build_name: 'flame-kk-ota'
-    build_type: 'opt'
-task:
-  metadata:
-    name: '[TC] B2G Flame KK OTA (user)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-ota-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: user
-      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Flame-KK-OTA
-      groupName:  Flame KitKat Device Image
-      machine:
-        platform: b2g-device-image
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_eng_base.yml'
-  variables:
-    build_name: 'flame-kk-spark-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Flame KK Eng (spark)'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-flame-kk-spark-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'flame-kk'
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: Be
-      groupSymbol: Flame-KK-spark
-      groupName: Flame KitKat Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/flame-kk.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'hamachi-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-eng'
-  metadata:
-    name: B2G Hamachi Eng
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-hamachi-eng: /home/worker/object-folder
-    env:
-      TARGET: 'hamachi'
-      DEBUG: 0
-      VARIANT: 'eng'
-  extra:
-    locations:
-      img: 'private/build/hamachi.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_hamachi_user.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'hamachi'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-user'
-  metadata:
-    name: B2G Hamachi User
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-hamachi-user: /home/worker/object-folder
-    env:
-      TARGET: 'hamachi'
-      DEBUG: 0
-  extra:
-    locations:
-      img: 'private/build/hamachi.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_helix_user.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'helix'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-helix-user'
-  metadata:
-    name: B2G Helix User
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-helix-user: /home/worker/object-folder
-    env:
-      TARGET: 'helix'
-      DEBUG: 0
-  extra:
-    locations:
-      img: 'private/build/helix.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_eng.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_eng_base.yml'
-  variables:
-    build_name: 'nexus-4-kk-eng'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Nexus 4 KK Eng'
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'nexus-4-kk'
-      DEBUG: 0
-    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: Be
-      groupSymbol: Nexus 4 KK
-      groupName: Nexus 4 Kitkat Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/nexus-4-kk.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'nexus-4-kk-ota'
-    build_type: 'debug'
-task:
-  workerType: flame-kk
-  metadata:
-    name: '[TC] B2G Nexus 4 KK OTA (userdebug)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko'
-
-  payload:
-    features:
-    cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0
-      TARGET: 'nexus-4-kk'
-      DEBUG: 0
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
-  extra:
-    locations:
-      img: 'private/build/nexus-4-kk.zip'
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Nexus-4-KK-OTA
-      groupName:  Nexus 4 KitKat Device Image
-      machine:
-        platform: b2g-device-image
-      collection:
-        debug: true
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_user.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'nexus-4-kk-user'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Nexus 4 KK User'
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-nexus-4-kk-user: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'nexus-4-kk'
-      DEBUG: 0
-    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: Nexus 4 KK
-      groupName: Nexus 4 Kitkat Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/nexus-4-kk.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'nexus-5-l-ota'
-    build_type: 'debug'
-task:
-  workerType: flame-kk
-  metadata:
-    name: '[TC] B2G Nexus 5L OTA (userdebug)'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko'
-
-  payload:
-    features:
-    cache:
-      level-{{level}}-{{project}}-build-nexus-5l-ota-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      VARIANT: userdebug
-      B2G_DEBUG: 0
-      TARGET: 'nexus-5-l'
-      DEBUG: 0
-      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
-      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
-  extra:
-    locations:
-      img: 'private/build/nexus-5-l.zip'
-    treeherderEnv:
-      - staging
-    treeherder:
-      symbol: B
-      groupSymbol: Nexus-5L-OTA
-      groupName:  Nexus 5 Lollipop Device Image
-      machine:
-        platform: b2g-device-image
-      collection:
-        debug: true
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'nexus-5-user'
-    build_type: 'opt'
-task:
-  workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Nexus 5-L User'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-nexus-5-l-user: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'nexus-5-l'
-      DEBUG: 0
-    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: Nexus 5-L
-      groupName: Nexus 5-L Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/nexus-5-l.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_dogfood.yml
@@ -0,0 +1,31 @@
+$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:level-{{level}}-{{project}}-build-aries-spark-dogfood'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko'
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-aries-spark-dogfood: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-spark-dogfood-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: userdebug
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries-DogFood
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_noril_opt.yml
@@ -0,0 +1,43 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries-noril'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Aries No RIL Opt'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      VARIANT: user
+      GAIA_OPTIMIZE: '1'
+      B2G_SYSTEM_APPS: '1'
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+      GECKO_CONFIGURE_ARGS: "--disable-b2g-ril"
+    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: Bnr
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      tier: 2
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_opt.yml
@@ -0,0 +1,41 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-opt-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Aries Opt'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-aries-opt: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-opt-objdir-gecko: /home/worker/objdir-gecko
+    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'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_debug.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_debug.yml'
+task:
+  payload:
+    env:
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_opt.yml
@@ -0,0 +1,6 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_opt.yml'
+task:
+  payload:
+    env:
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_base.yml
@@ -0,0 +1,25 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+task:
+  workerType: flame-kk
+
+  payload:
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
+
+  extra:
+    treeherder:
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'
+      mar: 'public/build/b2g-aries-gecko-update.mar'
+
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_debug.yml
@@ -0,0 +1,29 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
+  variables:
+    build_name: 'aries-ota'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Aries OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko'
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-aries-spark-ota-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-spark-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0
+  extra:
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries-Spark-OTA
+      groupName:  Aries Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_opt.yml
@@ -0,0 +1,26 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_base.yml'
+  variables:
+    build_name: 'aries-ota'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Aries OTA (user)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko'
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-aries-spark-ota-user: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-spark-ota-user-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: user
+  extra:
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Aries-Spark-OTA
+      groupName:  Aries Device Image
+      machine:
+        platform: b2g-device-image
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_eng.yml
@@ -0,0 +1,26 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+  variables:
+    build_name: 'dolphin-512-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-eng'
+  metadata:
+    name: '[TC] B2G Dolphin 512 Eng'
+
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Dolphin-512
+      groupName: Dolphin 512 Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-dolphin-512-eng: /home/worker/workspace
+    env:
+      TARGET: 'dolphin-512'
+      VARIANT: eng
+
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_opt.yml
@@ -0,0 +1,23 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+  variables:
+    build_name: 'dolphin-512'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-512-opt'
+  metadata:
+    name: '[TC] B2G Dolphin 512 Opt'
+
+  extra:
+    treeherder:
+      groupSymbol: Dolphin-512
+      groupName: Dolphin 512 Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-dolphin-512-opt: /home/worker/workspace
+    env:
+      TARGET: 'dolphin-512'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_base.yml
@@ -0,0 +1,31 @@
+$inherits:
+  from: 'tasks/phone_build.yml'
+task:
+  workerType: dolphin
+  metadata:
+    description: |
+      Dolphin phones + b2g environment used in full stack testing.
+  payload:
+    env:
+      REPO_TRACE: 1
+      VARIANT: user
+      DEBUG: 0
+
+    # Dolphin could take more than one hours to build!
+    maxRunTime: 7200
+
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-dolphin.sh $HOME/workspace
+
+  extra:
+    # Rather then enforcing particular conventions we require that all build
+    # tasks provide the "build" extra field to specify where the build and tests
+    # files are located.
+    locations:
+      build: 'private/build/b2g-android-arm.tar.gz'
+      tests: 'private/build/gaia.zip'
+      symbols: 'private/build/b2g-crashreporter-symbols.zip'
+      sources: 'private/build/sources.xml'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_eng.yml
@@ -0,0 +1,25 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+  variables:
+    build_name: 'dolphin-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-eng'
+  metadata:
+    name: '[TC] B2G Dolphin Eng'
+
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Dolphin
+      groupName: Dolphin Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-dolphin-eng: /home/worker/workspace
+    env:
+      TARGET: 'dolphin'
+      VARIANT: eng
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_opt.yml
@@ -0,0 +1,24 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+  variables:
+    build_name: 'dolphin'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-dolphin-opt'
+  metadata:
+    name: '[TC] B2G Dolphin Opt'
+
+  extra:
+    treeherder:
+      groupSymbol: Dolphin
+      groupName: Dolphin Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-dolphin-opt: /home/worker/workspace
+    env:
+      TARGET: 'dolphin'
+
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_debug.yml
@@ -0,0 +1,40 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'debug'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Flame KK Debug'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-debug-objdir-gecko: /home/worker/objdir-gecko
+    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'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_eng.yml
@@ -0,0 +1,30 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
+  variables:
+    build_name: 'flame-kk-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Flame KK Eng'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-eng: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-eng-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'flame-kk'
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      symbol: Be
+      groupSymbol: Flame-KK
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/flame-kk.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_opt.yml
@@ -0,0 +1,37 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Flame KK Opt'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-opt: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-opt-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'flame-kk'
+      DEBUG: 0
+    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
+    locations:
+      img: 'private/build/flame-kk.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_base.yml
@@ -0,0 +1,19 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+task:
+  workerType: flame-kk
+  payload:
+    env:
+      TARGET: 'flame-kk'
+      DEBUG: 0
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
+
+  extra:
+    locations:
+      img: 'private/build/flame-kk.zip'
+      mar: 'public/build/b2g-flame-gecko-update.mar'
+
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_debug.yml
@@ -0,0 +1,32 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
+  variables:
+    build_name: 'flame-kk-ota'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-ota-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0
+      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+  extra:
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Flame-KK-OTA
+      groupName:  Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_opt.yml
@@ -0,0 +1,29 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_ota_base.yml'
+  variables:
+    build_name: 'flame-kk-ota'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK OTA (user)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-ota-user: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-ota-user-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: user
+      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+  extra:
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Flame-KK-OTA
+      groupName:  Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_spark_eng.yml
@@ -0,0 +1,30 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
+  variables:
+    build_name: 'flame-kk-spark-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Flame KK Eng (spark)'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-flame-kk-spark-eng: /home/worker/workspace
+      level-{{level}}-{{project}}-build-flame-kk-spark-eng-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'flame-kk'
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+  extra:
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: Be
+      groupSymbol: Flame-KK-spark
+      groupName: Flame KitKat Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/flame-kk.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_eng.yml
@@ -0,0 +1,20 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'hamachi-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-eng'
+  metadata:
+    name: B2G Hamachi Eng
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-hamachi-eng: /home/worker/object-folder
+    env:
+      TARGET: 'hamachi'
+      DEBUG: 0
+      VARIANT: 'eng'
+  extra:
+    locations:
+      img: 'private/build/hamachi.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_user.yml
@@ -0,0 +1,19 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'hamachi'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-hamachi-user'
+  metadata:
+    name: B2G Hamachi User
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-hamachi-user: /home/worker/object-folder
+    env:
+      TARGET: 'hamachi'
+      DEBUG: 0
+  extra:
+    locations:
+      img: 'private/build/hamachi.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_helix_user.yml
@@ -0,0 +1,19 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'helix'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-helix-user'
+  metadata:
+    name: B2G Helix User
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-helix-user: /home/worker/object-folder
+    env:
+      TARGET: 'helix'
+      DEBUG: 0
+  extra:
+    locations:
+      img: 'private/build/helix.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_eng.yml
@@ -0,0 +1,36 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
+  variables:
+    build_name: 'nexus-4-kk-eng'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Nexus 4 KK Eng'
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-nexus-4-kk-eng: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-4-kk-eng-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'nexus-4-kk'
+      DEBUG: 0
+    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: Be
+      groupSymbol: Nexus 4 KK
+      groupName: Nexus 4 Kitkat Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/nexus-4-kk.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_ota_debug.yml
@@ -0,0 +1,42 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'nexus-4-kk-ota'
+    build_type: 'debug'
+task:
+  workerType: flame-kk
+  metadata:
+    name: '[TC] B2G Nexus 4 KK OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko'
+
+  payload:
+    features:
+    cache:
+      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0
+      TARGET: 'nexus-4-kk'
+      DEBUG: 0
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
+  extra:
+    locations:
+      img: 'private/build/nexus-4-kk.zip'
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Nexus-4-KK-OTA
+      groupName:  Nexus 4 KitKat Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_user.yml
@@ -0,0 +1,36 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'nexus-4-kk-user'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Nexus 4 KK User'
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-nexus-4-kk-user: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-4-kk-user-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'nexus-4-kk'
+      DEBUG: 0
+    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: Nexus 4 KK
+      groupName: Nexus 4 Kitkat Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/nexus-4-kk.zip'
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_ota_debug.yml
@@ -0,0 +1,43 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'nexus-5-l-ota'
+    build_type: 'debug'
+task:
+  workerType: flame-kk
+  metadata:
+    name: '[TC] B2G Nexus 5L OTA (userdebug)'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko'
+
+  payload:
+    features:
+    cache:
+      level-{{level}}-{{project}}-build-nexus-5l-ota-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 0
+      TARGET: 'nexus-5-l'
+      DEBUG: 0
+      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace
+  extra:
+    locations:
+      img: 'private/build/nexus-5-l.zip'
+    treeherderEnv:
+      - staging
+    treeherder:
+      symbol: B
+      groupSymbol: Nexus-5L-OTA
+      groupName:  Nexus 5 Lollipop Device Image
+      machine:
+        platform: b2g-device-image
+      collection:
+        debug: true
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_user.yml
@@ -0,0 +1,37 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'nexus-5-user'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko'
+  metadata:
+    name: '[TC] B2G Nexus 5-L User'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-nexus-5-l-user: /home/worker/object-folder
+      level-{{level}}-{{project}}-build-nexus-5-l-user-objdir-gecko: /home/worker/objdir-gecko
+    env:
+      TARGET: 'nexus-5-l'
+      DEBUG: 0
+    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: Nexus 5-L
+      groupName: Nexus 5-L Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/nexus-5-l.zip'