From 62dd3a4390abc7108880e653187deca52a311879 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Fri, 4 May 2018 12:07:05 -0600 Subject: [PATCH] Bug 1461784: [release] Only use the partials cache on level 3 jobs; r=sfraser When running jobs on try, we shouldn't have access to the partials, so don't try to give them. Differential Revision: https://phabricator.services.mozilla.com/D1352 --HG-- extra : source : 90d19b52f956ce509525ca160ef5a2af80eea1a9 extra : histedit_source : b303ac9a4117a4e8e047d6459a7ba6477b74b762 --- taskcluster/taskgraph/transforms/partials.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/taskcluster/taskgraph/transforms/partials.py b/taskcluster/taskgraph/transforms/partials.py index 4c85e93893a0..ef64d18bd4c4 100644 --- a/taskcluster/taskgraph/transforms/partials.py +++ b/taskcluster/taskgraph/transforms/partials.py @@ -122,6 +122,8 @@ def make_task_description(config, jobs): elif 'esr' in config.params['project']: mar_channel_id = 'firefox-mozilla-esr' + level = config.params['level'] + worker = { 'artifacts': _generate_task_output_files(dep_job, builds.keys(), locale), 'implementation': 'docker-worker', @@ -133,14 +135,13 @@ def make_task_description(config, jobs): 'env': { 'SHA1_SIGNING_CERT': 'nightly_sha1', 'SHA384_SIGNING_CERT': 'nightly_sha384', - 'DATADOG_API_SECRET': 'project/releng/gecko/build/level-3/datadog-api-key' + 'DATADOG_API_SECRET': + 'project/releng/gecko/build/level-{}/datadog-api-key'.format(level), } } if mar_channel_id: worker['env']['ACCEPTED_MAR_CHANNEL_IDS'] = mar_channel_id - level = config.params['level'] - task = { 'label': label, 'description': "{} Partials".format( @@ -158,7 +159,7 @@ def make_task_description(config, jobs): } # We only want caching on linux/windows due to bug 1436977 - if any([platform in dep_th_platform for platform in ['linux', 'windows']]): + if level == 3 and any([platform in dep_th_platform for platform in ['linux', 'windows']]): task['scopes'].append( 'auth:aws-s3:read-write:tc-gp-private-1d-us-east-1/releng/mbsdiff-cache/')