OLD | NEW |
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 } | 65 } |
66 | 66 |
67 | 67 |
68 def derive_compile_bot_name(api): | 68 def derive_compile_bot_name(api): |
69 builder_name = api.properties['buildername'] | 69 builder_name = api.properties['buildername'] |
70 builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name) | 70 builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name) |
71 if builder_cfg['role'] == 'Housekeeper': | 71 if builder_cfg['role'] == 'Housekeeper': |
72 return 'Build-Ubuntu-GCC-x86_64-Release-Shared' | 72 return 'Build-Ubuntu-GCC-x86_64-Release-Shared' |
73 if builder_cfg['role'] in ('Test', 'Perf'): | 73 if builder_cfg['role'] in ('Test', 'Perf'): |
74 task_os = builder_cfg['os'] | 74 task_os = builder_cfg['os'] |
75 extra_config = builder_cfg.get('extra_config') | 75 extra_config = builder_cfg.get('extra_config', '') |
76 if task_os == 'Android': | 76 if task_os == 'Android': |
77 if extra_config == 'Vulkan': | 77 if extra_config == 'Vulkan': |
78 extra_config = '%s_%s' % (task_os, 'Vulkan') | 78 extra_config = '%s_%s' % (task_os, 'Vulkan') |
79 elif extra_config == 'GN_Android': | 79 elif 'GN_Android' in extra_config: |
80 pass # i.e. extra_config stays GN_Android | 80 pass # i.e. extra_config stays GN_Android or GN_Android_Vulkan |
81 else: | 81 else: |
82 extra_config = task_os | 82 extra_config = task_os |
83 task_os = 'Ubuntu' | 83 task_os = 'Ubuntu' |
84 elif task_os == 'iOS': | 84 elif task_os == 'iOS': |
85 extra_config = task_os | 85 extra_config = task_os |
86 task_os = 'Mac' | 86 task_os = 'Mac' |
87 elif 'Win' in task_os: | 87 elif 'Win' in task_os: |
88 task_os = 'Win' | 88 task_os = 'Win' |
89 return api.builder_name_schema.MakeBuilderName( | 89 return api.builder_name_schema.MakeBuilderName( |
90 role=api.builder_name_schema.BUILDER_ROLE_BUILD, | 90 role=api.builder_name_schema.BUILDER_ROLE_BUILD, |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 mastername='client.skia', | 817 mastername='client.skia', |
818 slavename='skiabot-linux-swarm-000', | 818 slavename='skiabot-linux-swarm-000', |
819 buildnumber=5, | 819 buildnumber=5, |
820 path_config='kitchen', | 820 path_config='kitchen', |
821 revision='abc123', | 821 revision='abc123', |
822 **gerrit_kwargs) + | 822 **gerrit_kwargs) + |
823 api.step_data( | 823 api.step_data( |
824 'upload new .isolated file for test_skia', | 824 'upload new .isolated file for test_skia', |
825 stdout=api.raw_io.output('def456 XYZ.isolated')) | 825 stdout=api.raw_io.output('def456 XYZ.isolated')) |
826 ) | 826 ) |
OLD | NEW |