Bug 1267948 - Move sm-* jobs from try-only to base jobs, r=garndt

--HG-- extra : rebase_source : 5897f1522a980965ea4b3cbcd30fa9162febeedc extra : amend_source : d77e0bd041a3b5e223845dbd109899f15a4a4b9b
mozilla · Apr 27, 2016 · 2142735 · 2142735
1 parent b4020b7
commit 2142735
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -63,6 +63,13 @@ builds:
   linux64:
     platforms:
       - Linux64
+    extra-builds:
+      - sm-plain
+      - sm-arm-sim
+      - sm-compacting
+      - sm-generational
+      - sm-rootanalysis
+      - sm-warnaserr
     types:
       opt:
         task: tasks/builds/opt_linux64.yml
@@ -106,6 +113,80 @@ builds:
     types:
       debug:
         task: tasks/builds/mulet_haz_linux.yml
+  sm-plain:
+    platforms:
+      - Linux64
+    types:
+      opt:
+        task: tasks/builds/sm_plain.yml
+      debug:
+       task: tasks/builds/sm_plaindebug.yml
+    when:
+      file_patterns:
+       - js/public/**
+       - js/src/**
+  sm-arm-sim:
+    platforms:
+      - Linux64
+    types:
+      opt:
+        task: tasks/builds/sm_arm_sim.yml
+    when:
+      file_patterns:
+       - js/public/**
+       - js/src/**
+  sm-arm-sim-osx:
+    platforms:
+      - Linux64
+    types:
+      opt:
+        task: tasks/builds/sm_arm_sim_osx.yml
+    when:
+      file_patterns:
+       - js/public/**
+       - js/src/**
+  sm-compacting:
+    platforms:
+      - Linux64
+    types:
+      opt:
+        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
+    when:
+      file_patterns:
+       - js/public/**
+       - js/src/**
 
 tests:
   cppunit:

diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -40,13 +40,6 @@ builds:
   linux64:
     platforms:
       - Linux64
-    extra-builds:
-      - sm-plain
-      - sm-arm-sim
-      - sm-compacting
-      - sm-generational
-      - sm-rootanalysis
-      - sm-warnaserr
     types:
       opt:
         task: tasks/builds/opt_linux64.yml
@@ -84,80 +77,6 @@ builds:
     types:
       opt:
         task: tasks/builds/opt_macosx64_st-an.yml
-  sm-plain:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        task: tasks/builds/sm_plain.yml
-      debug:
-       task: tasks/builds/sm_plaindebug.yml
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
-  sm-arm-sim:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        task: tasks/builds/sm_arm_sim.yml
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
-  sm-arm-sim-osx:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        task: tasks/builds/sm_arm_sim_osx.yml
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
-  sm-compacting:
-    platforms:
-      - Linux64
-    types:
-      opt:
-        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
-    when:
-      file_patterns:
-       - js/public/**
-       - js/src/**
 
 post-build:
   upload-symbols: