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

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

Issue 2294353002: Add and use a clang_linux asset. (Closed)
Patch Set: SAN|Clang 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
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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 return api.swarming.collect_swarming_task(task) 347 return api.swarming.collect_swarming_task(task)
348 348
349 349
350 def compile_steps_swarm(api, builder_cfg, got_revision, infrabots_dir): 350 def compile_steps_swarm(api, builder_cfg, got_revision, infrabots_dir):
351 builder_name = derive_compile_bot_name(api) 351 builder_name = derive_compile_bot_name(api)
352 compile_builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name) 352 compile_builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name)
353 353
354 cipd_packages = [] 354 cipd_packages = []
355 355
356 # Android bots require a toolchain. 356 # Android bots require a toolchain.
357 if 'Android' in api.properties['buildername']: 357 if 'Android' in builder_name:
358 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_sdk')) 358 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_sdk'))
359 if 'Mac' in api.properties['buildername']: 359 if 'Mac' in builder_name:
360 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_darwin')) 360 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_darwin'))
361 else: 361 else:
362 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_linux')) 362 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_linux'))
363 363
364 if 'Ubuntu' in builder_name and (
365 'SAN' in builder_name or 'Clang' in builder_name):
366 cipd_packages.append(cipd_pkg(api, infrabots_dir, 'clang_linux'))
367
364 # Windows bots require a toolchain. 368 # Windows bots require a toolchain.
365 if 'Win' in builder_name: 369 if 'Win' in builder_name:
366 version_file = infrabots_dir.join('assets', 'win_toolchain', 'VERSION') 370 version_file = infrabots_dir.join('assets', 'win_toolchain', 'VERSION')
367 version = api.run.readfile(version_file, 371 version = api.run.readfile(version_file,
368 name='read win_toolchain VERSION', 372 name='read win_toolchain VERSION',
369 test_data='0').rstrip() 373 test_data='0').rstrip()
370 version = 'version:%s' % version 374 version = 'version:%s' % version
371 pkg = ('t', 'skia/bots/win_toolchain', version) 375 pkg = ('t', 'skia/bots/win_toolchain', version)
372 cipd_packages.append(pkg) 376 cipd_packages.append(pkg)
373 377
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 mastername='client.skia', 808 mastername='client.skia',
805 slavename='skiabot-linux-swarm-000', 809 slavename='skiabot-linux-swarm-000',
806 buildnumber=5, 810 buildnumber=5,
807 path_config='kitchen', 811 path_config='kitchen',
808 revision='abc123', 812 revision='abc123',
809 **gerrit_kwargs) + 813 **gerrit_kwargs) +
810 api.step_data( 814 api.step_data(
811 'upload new .isolated file for test_skia', 815 'upload new .isolated file for test_skia',
812 stdout=api.raw_io.output('def456 XYZ.isolated')) 816 stdout=api.raw_io.output('def456 XYZ.isolated'))
813 ) 817 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698