| Index: scripts/slave/swarming/trigger_swarm.py
|
| diff --git a/scripts/slave/swarming/trigger_swarm.py b/scripts/slave/swarming/trigger_swarm.py
|
| index a1eb49e22137865b51bbef1d4f72514a316a07a7..97c1de53ee999bfd92e73024e169280068a39c0d 100755
|
| --- a/scripts/slave/swarming/trigger_swarm.py
|
| +++ b/scripts/slave/swarming/trigger_swarm.py
|
| @@ -50,22 +50,30 @@ def v0(client, options):
|
| return subprocess.call(cmd, cwd=client)
|
|
|
|
|
| -def v1(client, options):
|
| - """Adds --priority support in r217581."""
|
| +def v0_1(client, options):
|
| + """Code starting around r218375.
|
| +
|
| + TODO(maruel): Put exact revision once committe.d
|
| + """
|
| cmd = [
|
| sys.executable,
|
| - os.path.join(client, 'swarm_trigger_step.py'),
|
| - '--swarm-url', options.swarming,
|
| - '--data-server', options.isolate_server,
|
| - '--os_image', options.os,
|
| - '--test-name-prefix', options.prefix,
|
| + os.path.join(client, 'swarming.py'),
|
| + 'trigger',
|
| + '--swarming', options.swarming,
|
| + '--isolate-server', options.isolate_server,
|
| + '--os', options.os,
|
| + '--task-prefix', options.prefix,
|
| '--priority', str(PRIORITIES[options.type]),
|
| ]
|
|
|
| for i in options.tasks:
|
| - cmd.append('--run_from_hash')
|
| + cmd.append('--tasks')
|
| cmd.extend(i)
|
|
|
| + # Enable profiling on the -dev server.
|
| + if '-dev' in options.swarming:
|
| + cmd.append('--profile')
|
| +
|
| print ' '.join(cmd)
|
| return subprocess.call(cmd, cwd=client)
|
|
|
| @@ -73,8 +81,10 @@ def v1(client, options):
|
| def determine_version_and_run_handler(client, options):
|
| """Executes the proper handler based on the code layout and --version support.
|
| """
|
| - # TODO(maruel): Determine version.
|
| - return v0(client, options)
|
| + if os.path.isfile(os.path.join(client, 'swarm_get_results.py')):
|
| + # Oh, that's old.
|
| + return v0(client, options)
|
| + return v0_1(client, options)
|
|
|
|
|
| def main():
|
| @@ -104,6 +114,8 @@ def main():
|
| parser.add_option(
|
| '--type',
|
| choices=sorted(PRIORITIES),
|
| + # TODO(maruel): Remove once all masters are restarted.
|
| + default='tryjob',
|
| help='Type of job will define it\'s priority')
|
| parser.add_option(
|
| '--task', nargs=4, action='append', default=[], dest='tasks')
|
|
|