Bug 1270888 - Fix the sm-* build types; they are debug but claim to be opt, r=jmaher

MozReview-Commit-ID: 2rXVMCToDhR

--HG--
extra : rebase_source : 20ad31daa5508bba4b3ea037e87bd829adda36ec

testing/taskcluster/tasks/branches/base_jobs.yml

@@ -51,9 +51,7 @@ builds:
       - sm-plain
       - sm-arm-sim
       - sm-compacting
-      - sm-generational
       - sm-rootanalysis
-      - sm-warnaserr
     types:
       opt:
         task: tasks/builds/opt_linux64.yml
@@ -116,7 +114,7 @@ builds:
       opt:
         task: tasks/builds/sm_plain.yml
       debug:
-       task: tasks/builds/sm_plaindebug.yml
+        task: tasks/builds/sm_plaindebug.yml
     when:
       file_patterns:
        - js/public/**
@@ -125,7 +123,7 @@ builds:
     platforms:
       - Linux64
     types:
-      opt:
+      debug:
         task: tasks/builds/sm_arm_sim.yml
     when:
       file_patterns:
@@ -135,7 +133,7 @@ builds:
     platforms:
       - Linux64
     types:
-      opt:
+      debug:
         task: tasks/builds/sm_arm_sim_osx.yml
     when:
       file_patterns:
@@ -145,40 +143,18 @@ builds:
     platforms:
       - Linux64
     types:
-      opt:
+      debug:
         task: tasks/builds/sm_compacting.yml
     when:
       file_patterns:
        - js/public/**
        - js/src/**
-  sm-generational:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        task: tasks/builds/sm_generational.yml
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
   sm-rootanalysis:
     platforms:
       - Linux64
     types:
-      opt:
-        task: tasks/builds/sm_rootanalysis.yml
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
-  sm-warnaserr:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        task: tasks/builds/sm_warnaserr.yml
       debug:
-        task: tasks/builds/sm_warnaserrdebug.yml
+        task: tasks/builds/sm_rootanalysis.yml
     when:
       file_patterns:
        - js/public/**

testing/taskcluster/tasks/builds/sm_arm_sim.yml

@@ -2,7 +2,7 @@ $inherits:
   from: 'tasks/builds/sm_base.yml'
   variables:
     build_name: 'sm-arm-sim'
-    build_type: 'opt'
+    build_type: 'debug'
 task:
   payload:
     env:

testing/taskcluster/tasks/builds/sm_arm_sim_osx.yml

@@ -2,7 +2,7 @@ $inherits:
   from: 'tasks/builds/sm_base.yml'
   variables:
     build_name: 'sm-arm-sim-osx'
-    build_type: 'opt'
+    build_type: 'debug'
 task:
   payload:
     env:

testing/taskcluster/tasks/builds/sm_compacting.yml

@@ -2,7 +2,7 @@ $inherits:
   from: 'tasks/builds/sm_base.yml'
   variables:
     build_name: 'sm-compacting'
-    build_type: 'opt'
+    build_type: 'debug'
 task:
   payload:
     env:

testing/taskcluster/tasks/builds/sm_generational.yml

@@ -1,15 +0,0 @@
-$inherits:
-  from: 'tasks/builds/sm_base.yml'
-  variables:
-    build_name: 'sm-generational'
-    build_type: 'opt'
-task:
-  payload:
-    env:
-      SPIDERMONKEY_VARIANT: 'generational'
-  metadata:
-    name: '[TC] Spidermonkey Generational'
-    description: 'Spidermonkey Generational'
-  extra:
-    treeherder:
-      symbol: ggc

testing/taskcluster/tasks/builds/sm_rootanalysis.yml

@@ -2,7 +2,7 @@ $inherits:
   from: 'tasks/builds/sm_base.yml'
   variables:
     build_name: 'sm-rootanalysis'
-    build_type: 'opt'
+    build_type: 'debug'
 task:
   payload:
     env:

testing/taskcluster/tasks/builds/sm_warnaserr.yml

@@ -1,15 +0,0 @@
-$inherits:
-  from: 'tasks/builds/sm_base.yml'
-  variables:
-    build_name: 'sm-warnaserr'
-    build_type: 'opt'
-task:
-  payload:
-    env:
-      SPIDERMONKEY_VARIANT: 'warnaserr'
-  metadata:
-    name: '[TC] Spidermonkey Fail-On-Warnings Build'
-    description: 'Spidermonkey Fail-On-Warnings Build'
-  extra:
-    treeherder:
-      symbol: e

testing/taskcluster/tasks/builds/sm_warnaserrdebug.yml

@@ -1,17 +0,0 @@
-$inherits:
-  from: 'tasks/builds/sm_base.yml'
-  variables:
-    build_name: 'sm-warnaserrdebug'
-    build_type: 'debug'
-task:
-  payload:
-    env:
-      SPIDERMONKEY_VARIANT: 'warnaserrdebug'
-  metadata:
-    name: '[TC] Spidermonkey Fail-On-Warnings Build Debug'
-    description: 'Spidermonkey Fail-On-Warnings Build Debug'
-  extra:
-    treeherder:
-      symbol: e
-      collection:
-        debug: true