Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: infra/bots/recipes/swarm_trigger.py

Issue 2306603002: preserve GN_Android in compile -> test mapper (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 # Recipe module for Skia Swarming trigger. 6 # Recipe module for Skia Swarming trigger.
7 7
8 8
9 import os 9 import os
10 import json 10 import json
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 builder_name = api.properties['buildername'] 68 builder_name = api.properties['buildername']
69 builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name) 69 builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name)
70 if builder_cfg['role'] == 'Housekeeper': 70 if builder_cfg['role'] == 'Housekeeper':
71 return 'Build-Ubuntu-GCC-x86_64-Release-Shared' 71 return 'Build-Ubuntu-GCC-x86_64-Release-Shared'
72 if builder_cfg['role'] in ('Test', 'Perf'): 72 if builder_cfg['role'] in ('Test', 'Perf'):
73 task_os = builder_cfg['os'] 73 task_os = builder_cfg['os']
74 extra_config = builder_cfg.get('extra_config') 74 extra_config = builder_cfg.get('extra_config')
75 if task_os == 'Android': 75 if task_os == 'Android':
76 if extra_config == 'Vulkan': 76 if extra_config == 'Vulkan':
77 extra_config = '%s_%s' % (task_os, 'Vulkan') 77 extra_config = '%s_%s' % (task_os, 'Vulkan')
78 else: 78 elif extra_config != 'GN_Android':
borenet 2016/09/01 15:06:10 Nit: add "extra_config == 'GN_Android'" case with
79 extra_config = task_os 79 extra_config = task_os
80 task_os = 'Ubuntu' 80 task_os = 'Ubuntu'
81 elif task_os == 'iOS': 81 elif task_os == 'iOS':
82 extra_config = task_os 82 extra_config = task_os
83 task_os = 'Mac' 83 task_os = 'Mac'
84 elif 'Win' in task_os: 84 elif 'Win' in task_os:
85 task_os = 'Win' 85 task_os = 'Win'
86 return api.builder_name_schema.MakeBuilderName( 86 return api.builder_name_schema.MakeBuilderName(
87 role=api.builder_name_schema.BUILDER_ROLE_BUILD, 87 role=api.builder_name_schema.BUILDER_ROLE_BUILD,
88 os=task_os, 88 os=task_os,
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 mastername='client.skia', 808 mastername='client.skia',
809 slavename='skiabot-linux-swarm-000', 809 slavename='skiabot-linux-swarm-000',
810 buildnumber=5, 810 buildnumber=5,
811 path_config='kitchen', 811 path_config='kitchen',
812 revision='abc123', 812 revision='abc123',
813 **gerrit_kwargs) + 813 **gerrit_kwargs) +
814 api.step_data( 814 api.step_data(
815 'upload new .isolated file for test_skia', 815 'upload new .isolated file for test_skia',
816 stdout=api.raw_io.output('def456 XYZ.isolated')) 816 stdout=api.raw_io.output('def456 XYZ.isolated'))
817 ) 817 )
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698