bug 1343144 - use nightly beetmover on beta and release. r=mtabara a=release

MozReview-Commit-ID: GrWWYvWRpnj

--HG--
extra : rebase_source : 88235c33958c56038aa096510246e5eada84375b

taskcluster/taskgraph/target_tasks.py

@@ -210,10 +210,7 @@ def target_tasks_mozilla_beta(full_task_graph, parameters):
         if platform in ('android-api-15', 'android-x86'):
             return True
         if platform in ('linux64-nightly', 'linux-nightly'):
-            if task.kind not in [
-                'balrog', 'beetmover', 'beetmover-checksums', 'beetmover-l10n',
-                'checksums-signing',
-            ]:
+            if task.kind not in ['balrog']:
                 return task.attributes.get('nightly', False)
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 

taskcluster/taskgraph/util/scriptworker.py

@@ -49,10 +49,19 @@ SIGNING_CERT_SCOPES = {
 }
 
 """Map beetmover scope aliases to sets of projects.
-
-Currently this mirrors the signing scope alias behavior.
 """
-BEETMOVER_SCOPE_ALIAS_TO_PROJECT = deepcopy(SIGNING_SCOPE_ALIAS_TO_PROJECT)
+BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [[
+    'all-nightly-branches', set([
+        'mozilla-central',
+        'mozilla-aurora',
+        'jamun',
+        'mozilla-beta',
+        'mozilla-release',
+    ])
+], [
+    'all-release-branches', set([
+    ])
+]]
 
 """Map beetmover tasks aliases to sets of target task methods.
 
@@ -62,11 +71,11 @@ BEETMOVER_SCOPE_ALIAS_TO_TARGET_TASK = [[
     'all-nightly-tasks', set([
         'nightly_fennec',
         'nightly_linux',
+        'mozilla_beta_tasks',
+        'mozilla_release_tasks',
     ])
 ], [
     'all-release-tasks', set([
-        'mozilla_beta_tasks',
-        'mozilla_release_tasks',
     ])
 ]]