diff options
Diffstat (limited to 'infra/bots/ct')
-rw-r--r-- | infra/bots/ct/ct_skps.isolate | 9 | ||||
-rwxr-xr-x | infra/bots/ct/run_ct_skps.py | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/infra/bots/ct/ct_skps.isolate b/infra/bots/ct/ct_skps.isolate index 887f60c54e..1289ac9902 100644 --- a/infra/bots/ct/ct_skps.isolate +++ b/infra/bots/ct/ct_skps.isolate @@ -3,8 +3,8 @@ # found in the LICENSE file. { - 'includes': [ - '../resources.isolate', + 'includes': [ + '../resources.isolate', ], 'conditions': [ ['OS=="linux"', { @@ -12,7 +12,7 @@ 'files': [ '<(TOOL_NAME)', 'run_ct_skps.py', - '../../../../skps/<(BUILDER)/slave<(SLAVE_NUM)/', + '../../../../skps/<(CHROMIUM_BUILD)/<(PAGE_TYPE)/<(NUM_SLAVES)/slave<(SLAVE_NUM)/', ], 'command': [ 'python', @@ -23,6 +23,9 @@ '--isolated_outdir', '${ISOLATED_OUTDIR}', '--configuration', '<(CONFIGURATION)', '--builder', '<(BUILDER)', + '--chromium_build', '<(CHROMIUM_BUILD)', + '--page_type', '<(PAGE_TYPE)', + '--num_slaves', '<(NUM_SLAVES)', ], }, }], diff --git a/infra/bots/ct/run_ct_skps.py b/infra/bots/ct/run_ct_skps.py index 48f2e7d3d9..9912abd8a0 100755 --- a/infra/bots/ct/run_ct_skps.py +++ b/infra/bots/ct/run_ct_skps.py @@ -35,11 +35,18 @@ def main(): 'isolateserver all artifacts in this dir.') parser.add_argument('-b', '--builder', required=True, help='The name of the builder.') + parser.add_argument('-r', '--chromium_build', required=True, + help='The chromium build used to create the SKP repo.') + parser.add_argument('-p', '--page_type', required=True, + help='The CT page type.') + parser.add_argument('-n', '--num_slaves', required=True, + help='Total number of slaves used to run the build.') args = parser.parse_args() tool_path = os.path.join(PARENT_DIR, args.tool) - skps_dir = os.path.join(REPOS_BASE_DIR, 'skps', args.builder, - 'slave%d' % args.slave_num) + skps_dir = os.path.join( + REPOS_BASE_DIR, 'skps', args.chromium_build, args.page_type, + args.num_slaves, 'slave%d' % args.slave_num) resource_path = os.path.join(SKIA_SRC_DIR, 'resources') cmd = [tool_path] |