diff options
| author |  Ravi Mistry <rmistry@google.com> | 2017-08-08 07:39:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-08 14:17:49 +0000 |
| commit | 0ac06e47269a40c177747310a613d213c95d1d6d (patch) | |
| tree | 329918c16fefd939e20c0bbb7f847b4fd8aac0d8 /infra/bots/ct | |
| parent | 65a88fadab72abd104fdf4cc4a97488b2e901c60 (diff) | |
Bot updates for SkiaCT tasks.
Use gcc-4.8 when compiling for Ubuntu14. Rename the CT tasks to make it
clear their child tasks run on Ubuntu14.
Move to Debian-9.1 bots created with the changes in
https://skia-review.googlesource.com/c/31281 and
https://skia-review.googlesource.com/c/31820
Change the cache dir used by the ct_skps recipe so that changing the
bot name doesn't invalidate the cache.
Bug: skia:6921
Bug: skia:6818
No-Try: true
Change-Id: Idaac8187427b5c2c7bffe66ad6674496b8cd0c0e
Reviewed-on: https://skia-review.googlesource.com/31242
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
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] |