aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-09-14 05:44:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-14 05:44:31 -0700
commit4ff7871ed368cf0b1f28da9096314a1f827f79e4 (patch)
tree3a85169d359b66c296c58a24dc7dd8b5f5f911e4 /infra/bots
parent53c02e015664712649056b18b3d4da596b491186 (diff)
update derive_compile_bot_name() for GN_Android_Vulkan
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipes/swarm_trigger.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 570b1eaf80..04e55649ea 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -72,12 +72,12 @@ def derive_compile_bot_name(api):
return 'Build-Ubuntu-GCC-x86_64-Release-Shared'
if builder_cfg['role'] in ('Test', 'Perf'):
task_os = builder_cfg['os']
- extra_config = builder_cfg.get('extra_config')
+ extra_config = builder_cfg.get('extra_config', '')
if task_os == 'Android':
if extra_config == 'Vulkan':
extra_config = '%s_%s' % (task_os, 'Vulkan')
- elif extra_config == 'GN_Android':
- pass # i.e. extra_config stays GN_Android
+ elif 'GN_Android' in extra_config:
+ pass # i.e. extra_config stays GN_Android or GN_Android_Vulkan
else:
extra_config = task_os
task_os = 'Ubuntu'