Skip to content

A
angle
Commit 05710d54 by Takuto Ikuta Committed by Commit Bot
Options

use go swarming client in trigger.py

python client is being deprecated. Tested by $ python third_party/angle/scripts/trigger.py --shards=2 -p chromium.tests out/Release base_unittests Ubuntu none Fixed: chromium:1047115 Change-Id: Id653e2b29e8bf02ab86eaa4c5c767d081fa29dbd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2095654 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 9e263aa8
Showing with 26 additions and 19 deletions
scripts/trigger.py
...@@ -46,23 +46,23 @@ def add_base_software(swarming_args): ...@@ -46,23 +46,23 @@ def add_base_software(swarming_args):
] ]
for pkg, vers in cipd_packages: for pkg, vers in cipd_packages:
swarming_args.append('--cipd-package=.swarming_module:%s:%s' % (pkg, vers)) swarming_args.append('--cipd-package=.swarming_module:%s=%s' % (pkg, vers))
# Add packages to $PATH # Add packages to $PATH
swarming_args.extend([ swarming_args.extend([
'--env-prefix=PATH', '--env-prefix',
'.swarming_module', 'PATH=.swarming_module',
'--env-prefix=PATH', '--env-prefix',
'.swarming_module/bin', 'PATH=.swarming_module/bin',
]) ])
# Add cache directives for vpython. # Add cache directives for vpython.
vpython_cache_path = '.swarming_module_cache/vpython' vpython_cache_path = '.swarming_module_cache/vpython'
swarming_args.extend([ swarming_args.extend([
'--named-cache=swarming_module_cache_vpython', '--named-cache',
vpython_cache_path, 'swarming_module_cache_vpython=' + vpython_cache_path,
'--env-prefix=VPYTHON_VIRTUALENV_ROOT', '--env-prefix',
vpython_cache_path, 'VPYTHON_VIRTUALENV_ROOT=' + vpython_cache_path,
]) ])
...@@ -88,22 +88,29 @@ def main(): ...@@ -88,22 +88,29 @@ def main():
sha = hashlib.sha1(f.read()).hexdigest() sha = hashlib.sha1(f.read()).hexdigest()
print('Got an isolated SHA of %s' % sha) print('Got an isolated SHA of %s' % sha)
swarming_script_path = os.path.join('tools', 'swarming_client', 'swarming.py') swarming_script_path = os.path.join('tools', 'luci-go', 'swarming')
swarming_args = [ swarming_args = [
'python', swarming_script_path, 'trigger', '-S', 'chromium-swarm.appspot.com', '-I', swarming_script_path, 'trigger', '-S', 'chromium-swarm.appspot.com', '-I',
'isolateserver.appspot.com', '-d', 'os', args.os_dim, '-d', 'pool', args.pool, '-d', 'gpu', 'https://isolateserver.appspot.com', '-d', 'os=' + args.os_dim, '-d', 'pool=' + args.pool,
args.gpu_dim, '-d', 'gpu=' + args.gpu_dim, '-s', sha
'--shards=%d' % args.shards, '-s', sha
] ]
add_base_software(swarming_args) add_base_software(swarming_args)
if unknown: for i in range(args.shards):
swarming_args += ["--"] + unknown shard_args = swarming_args[:]
shard_args.extend([
print(' '.join(swarming_args)) '--env',
subprocess.call(swarming_args) 'GTEST_TOTAL_SHARDS=%d' % args.shards,
'--env',
'GTEST_SHARD_INDEX=%d' % i,
])
if unknown:
shard_args += ["--"] + unknown
print(' '.join(shard_args))
subprocess.call(shard_args)
return 0 return 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment