Hash :
6f755d21
Author :
Date :
2020-11-05T16:12:38
Fix trigger.py using deprecated parameters. This changes the script to query the command from mb.py then call swarming trigger with -raw-cmd and -relative-cwd. See http://crbug.com/chrome-operations/94 Bug: None Change-Id: I1e11cd2e1314a4e96e1ee5a42b311f0c3cb5058b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2521240 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Dirk Pranke <dpranke@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
#!/usr/bin/python2
#
# Copyright 2019 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# trigger.py:
# Helper script for triggering GPU tests on swarming.
import argparse
import json
import hashlib
import logging
import os
import re
import subprocess
import sys
# This is the same as the trybots.
DEFAULT_TASK_PRIORITY = 30
def parse_args():
parser = argparse.ArgumentParser(os.path.basename(sys.argv[0]))
parser.add_argument('gn_path', help='path to GN. (e.g. out/Release)')
parser.add_argument('test', help='test name. (e.g. angle_end2end_tests)')
parser.add_argument('os_dim', help='OS dimension. (e.g. Windows-10)')
parser.add_argument('-s', '--shards', default=1, help='number of shards', type=int)
parser.add_argument('-p', '--pool', default='Chrome-GPU', help='swarming pool')
parser.add_argument('-g', '--gpu', help='GPU dimension. (e.g. intel-hd-630-win10-stable)')
parser.add_argument('-t', '--device-type', help='Android device type (e.g. bullhead)')
parser.add_argument('-o', '--device-os', help='Android OS.')
parser.add_argument('-v', '--verbose', action='store_true', help='Verbose logging.')
parser.add_argument(
'--priority',
help='Task priority. Default is %s. Use judiciously.' % DEFAULT_TASK_PRIORITY,
default=DEFAULT_TASK_PRIORITY)
return parser.parse_known_args()
def invoke_mb(args):
mb_script_path = os.path.join('tools', 'mb', 'mb.py')
mb_args = ['python', mb_script_path] + args
# Attempt to detect standalone vs chromium component build.
is_standalone = not os.path.isdir(os.path.join('third_party', 'angle'))
if is_standalone:
logging.info('Standalone mode detected.')
mb_args += ['-i', os.path.join('infra', 'gn_isolate_map.pyl')]
logging.info('Invoking mb: %s' % ' '.join(mb_args))
return subprocess.check_output(mb_args)
def main():
args, unknown = parse_args()
if args.verbose:
logging.basicConfig(level='INFO')
path = args.gn_path.replace('\\', '/')
out_gn_path = '//' + path
out_file_path = os.path.join(*path.split('/'))
get_command_output = invoke_mb(['get-swarming-command', out_gn_path, args.test, '--as-list'])
swarming_cmd = json.loads(get_command_output)
logging.info('Swarming command: %s' % ' '.join(swarming_cmd))
invoke_mb(['isolate', out_gn_path, args.test])
isolate_cmd_path = os.path.join('tools', 'luci-go', 'isolate')
isolate_file = os.path.join(out_file_path, '%s.isolate' % args.test)
isolated_file = os.path.join(out_file_path, '%s.isolated' % args.test)
isolate_args = [
isolate_cmd_path, 'archive', '-I', 'https://isolateserver.appspot.com', '-i', isolate_file,
'-s', isolated_file
]
logging.info('Invoking isolate: %s' % ' '.join(isolate_args))
subprocess.check_call(isolate_args)
with open(isolated_file, 'rb') as f:
sha = hashlib.sha1(f.read()).hexdigest()
logging.info('Got an isolated SHA of %s' % sha)
swarming_script_path = os.path.join('tools', 'luci-go', 'swarming')
swarming_args = [
swarming_script_path, 'trigger', '-S', 'chromium-swarm.appspot.com', '-I',
'https://isolateserver.appspot.com', '-d', 'os=' + args.os_dim, '-d', 'pool=' + args.pool,
'-s', sha
]
# Set priority. Don't abuse this!
swarming_args += ['-priority', str(args.priority)]
# Define a user tag.
try:
whoami = subprocess.check_output(['whoami'])
# Strip extra stuff (e.g. on Windows we are 'hostname\username')
whoami = re.sub(r'\w+[^\w]', '', whoami.strip())
swarming_args += ['-user', whoami]
except:
pass
if args.gpu:
swarming_args += ['-d', 'gpu=' + args.gpu]
if args.device_type:
swarming_args += ['-d', 'device_type=' + args.device_type]
if args.device_os:
swarming_args += ['-d', 'device_os=' + args.device_os]
cmd_args = ['-relative-cwd', args.gn_path, '-raw-cmd', '--'] + swarming_cmd
if unknown:
cmd_args += unknown
if args.shards > 1:
for i in range(args.shards):
shard_args = swarming_args[:]
shard_args.extend([
'--env',
'GTEST_TOTAL_SHARDS=%d' % args.shards,
'--env',
'GTEST_SHARD_INDEX=%d' % i,
])
shard_args += cmd_args
logging.info('Invoking swarming: %s' % ' '.join(shard_args))
subprocess.call(shard_args)
else:
swarming_args += cmd_args
logging.info('Invoking swarming: %s' % ' '.join(swarming_args))
subprocess.call(swarming_args)
return 0
if __name__ == '__main__':
sys.exit(main())