Bug 1275409: remove unused legacy task definitions; r=wcosta

MozReview-Commit-ID: SERhclvdAf --HG-- extra : rebase_source : 4f70f20bbeadccbca929dd6d5ad914f3c73ad34d
2016-06-04 22:53:50 +00:00 · 2016-06-04 22:53:50 +00:00 · fd242328bd
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_dogfood.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_dogfood.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_noril_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_noril_opt.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_opt.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_debug.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_balrog_opt.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_base.yml
@ -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'
-
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_debug.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_aries_spark_ota_opt.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_eng.yml
@ -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
-
--- a/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_512_opt.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_base.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_base.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_eng.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_dolphin_opt.yml
@ -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'
-
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_debug.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_eng.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_opt.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_base.yml
@ -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'
-
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_debug.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_opt.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_ota_opt.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_spark_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_flame_kk_spark_eng.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_eng.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_user.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_hamachi_user.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_helix_user.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_helix_user.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_eng.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_ota_debug.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_user.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_4_kk_user.yml
@ -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'
--- a/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_ota_debug.yml
@ -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
--- a/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_user.yml
+++ b/testing/taskcluster/tasks/builds/legacy/b2g_nexus_5l_user.yml
@ -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'