bug 1343144 - use nightly beetmover on beta and release. r=mtabara a=release DONTBUILD
authorAki Sasaki <asasaki@mozilla.com>
Tue, 28 Feb 2017 09:30:48 -0800
changeset 376497 56b6481b93fdcbfe965a5173e24ec399aa71d04c
parent 376496 65c9d527fc8c73f764ad481ea309dd7d6d3450bc
child 376498 8afa841e0879e1b366bae8b8b66c9e215ed5f1b5
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara, release
bugs1343144
milestone53.0a2
bug 1343144 - use nightly beetmover on beta and release. r=mtabara a=release DONTBUILD MozReview-Commit-ID: GrWWYvWRpnj
taskcluster/taskgraph/target_tasks.py
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -144,20 +144,17 @@ def target_tasks_mozilla_beta(full_task_
     """Select the set of tasks required for a promotable beta or release build
     of linux, plus android CI. The candidates build process involves a pipeline
     of builds and signing, but does not include beetmover or balrog jobs."""
     def filter(task):
         platform = task.attributes.get('build_platform')
         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)]
 
 
 @_target_task('mozilla_release_tasks')
 def target_tasks_mozilla_release(full_task_graph, parameters):
     """Select the set of tasks required for a promotable beta or release build
     of linux, plus android CI. The candidates build process involves a pipeline
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -44,34 +44,43 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
 """
 SIGNING_CERT_SCOPES = {
     'all-release-branches': 'project:releng:signing:cert:release-signing',
     'all-nightly-branches': 'project:releng:signing:cert:nightly-signing',
     'default': 'project:releng:signing:cert:dep-signing',
 }
 
 """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.
 
 This is a list of list-pairs, for ordering.
 """
 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',
     ])
 ]]
 
 """Map the beetmover scope aliases to the actual scopes.
 """
 BEETMOVER_BUCKET_SCOPES = {
     'all-release-branches': 'project:releng:beetmover:bucket:release',
     'all-nightly-branches': 'project:releng:beetmover:bucket:nightly',