Bug 1607857: Don't use treeherder platform for partials; r=sfraser

Differential Revision: https://phabricator.services.mozilla.com/D59400

--HG--
extra : moz-landing-system : lando

taskcluster/taskgraph/transforms/beetmover_repackage.py

@@ -21,7 +21,7 @@ from taskgraph.util.scriptworker import (generate_beetmover_artifact_map,
                                          get_beetmover_action_scope,
                                          get_worker_type_for_scope)
 from taskgraph.util.taskcluster import get_artifact_prefix
-from taskgraph.util.treeherder import replace_group
+from taskgraph.util.treeherder import replace_group, inherit_treeherder_from_dep
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
 
@@ -61,7 +61,7 @@ def make_task_description(config, jobs):
         dep_job = job['primary-dependency']
         attributes = dep_job.attributes
 
-        treeherder = job.get('treeherder', {})
+        treeherder = inherit_treeherder_from_dep(job, dep_job)
         upstream_symbol = dep_job.task['extra']['treeherder']['symbol']
         if 'build' in job['dependent-tasks']:
             upstream_symbol = job['dependent-tasks']['build'].task['extra']['treeherder']['symbol']
@@ -69,12 +69,6 @@ def make_task_description(config, jobs):
             'symbol',
             replace_group(upstream_symbol, 'BMR')
         )
-        dep_th_platform = dep_job.task.get('extra', {}).get(
-            'treeherder', {}).get('machine', {}).get('platform', '')
-        treeherder.setdefault('platform',
-                              "{}/opt".format(dep_th_platform))
-        treeherder.setdefault('tier', 1)
-        treeherder.setdefault('kind', 'build')
         label = job['label']
         description = (
             "Beetmover submission for locale '{locale}' for build '"

taskcluster/taskgraph/transforms/mar_signing.py

@@ -15,7 +15,7 @@ from taskgraph.util.scriptworker import (
 )
 from taskgraph.util.partials import get_balrog_platform_name, get_partials_artifacts_from_params
 from taskgraph.util.taskcluster import get_artifact_prefix
-from taskgraph.util.treeherder import join_symbol
+from taskgraph.util.treeherder import join_symbol, inherit_treeherder_from_dep
 
 import logging
 logger = logging.getLogger(__name__)
@@ -96,18 +96,12 @@ def make_task_description(config, jobs):
         dep_job = job['primary-dependency']
         locale = dep_job.attributes.get('locale')
 
-        treeherder = job.get('treeherder', {})
+        treeherder = inherit_treeherder_from_dep(job, dep_job)
         treeherder.setdefault(
             'symbol', join_symbol(job.get('treeherder-group', 'ms'), locale or 'N')
         )
 
         label = job.get('label', "{}-{}".format(config.kind, dep_job.label))
-        dep_th_platform = dep_job.task.get('extra', {}).get(
-            'treeherder', {}).get('machine', {}).get('platform', '')
-        treeherder.setdefault('platform',
-                              "{}/opt".format(dep_th_platform))
-        treeherder.setdefault('kind', 'build')
-        treeherder.setdefault('tier', 1)
 
         dependencies = {dep_job.kind: dep_job.label}
         signing_dependencies = dep_job.dependencies
@@ -124,14 +118,13 @@ def make_task_description(config, jobs):
         if locale:
             attributes['locale'] = locale
 
-        balrog_platform = get_balrog_platform_name(dep_th_platform)
+        build_platform = attributes.get('build_platform')
         if config.kind == 'partials-signing':
             upstream_artifacts = generate_partials_artifacts(
-                dep_job, config.params['release_history'], balrog_platform, locale)
+                dep_job, config.params['release_history'], build_platform, locale)
         else:
             upstream_artifacts = generate_complete_artifacts(dep_job, config.kind)
 
-        build_platform = dep_job.attributes.get('build_platform')
         is_nightly = job.get(
             'nightly',  # First check current job
             dep_job.attributes.get(

taskcluster/taskgraph/transforms/partials.py

@@ -11,6 +11,7 @@ from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.partials import get_builds
 from taskgraph.util.platforms import architecture
 from taskgraph.util.taskcluster import get_artifact_prefix
+from taskgraph.util.treeherder import inherit_treeherder_from_dep
 
 import logging
 logger = logging.getLogger(__name__)
@@ -45,17 +46,10 @@ def make_task_description(config, jobs):
     for job in jobs:
         dep_job = job['primary-dependency']
 
-        treeherder = job.get('treeherder', {})
+        treeherder = inherit_treeherder_from_dep(job, dep_job)
         treeherder.setdefault('symbol', 'p(N)')
 
         label = job.get('label', "partials-{}".format(dep_job.label))
-        dep_th_platform = dep_job.task.get('extra', {}).get(
-            'treeherder', {}).get('machine', {}).get('platform', '')
-
-        treeherder.setdefault('platform',
-                              "{}/opt".format(dep_th_platform))
-        treeherder.setdefault('kind', 'build')
-        treeherder.setdefault('tier', 1)
 
         dependencies = {dep_job.kind: dep_job.label}
 
@@ -68,7 +62,8 @@ def make_task_description(config, jobs):
 
         build_locale = locale or 'en-US'
 
-        builds = get_builds(config.params['release_history'], attributes["build_platform"],
+        build_platform = attributes['build_platform']
+        builds = get_builds(config.params['release_history'], build_platform,
                             build_locale)
 
         # If the list is empty there's no available history for this platform
@@ -116,7 +111,7 @@ def make_task_description(config, jobs):
             'env': {
                 'SHA1_SIGNING_CERT': 'nightly_sha1',
                 'SHA384_SIGNING_CERT': 'nightly_sha384',
-                'EXTRA_PARAMS': '--arch={}'.format(architecture(attributes['build_platform'])),
+                'EXTRA_PARAMS': '--arch={}'.format(architecture(build_platform)),
                 'MAR_CHANNEL_ID': attributes['mar-channel-id']
             }
         }
@@ -139,7 +134,7 @@ def make_task_description(config, jobs):
 
         # We only want caching on linux/windows due to bug 1436977
         if int(level) == 3 \
-                and any([platform in dep_th_platform for platform in ['linux', 'windows']]):
+                and any([build_platform.startswith(prefix) for prefix in ['linux', 'win']]):
             task['scopes'].append(
                 'auth:aws-s3:read-write:tc-gp-private-1d-us-east-1/releng/mbsdiff-cache/')