[test] Expand test-spec format

Each builder now uses a dict to specify tests with a 'tests' key. This
will allow adding other builder-specific keys in follow ups.

Prepared on infra side by:
https://crrev.com/c/1013713

Bug: chromium:830557
Change-Id: I1dd799cdfcc029ab22de813b7869abe982047e0f
Reviewed-on: https://chromium-review.googlesource.com/1013979
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52656}
This commit is contained in:
Michael Achenbach 2018-04-17 15:28:18 +02:00 committed by Commit Bot
parent 894b95fe38
commit 69002f713a
3 changed files with 109 additions and 73 deletions

View File

@ -14,14 +14,16 @@ Every master has an optional file named `<mastername>.pyl`. E.g.
The structure of each file is: The structure of each file is:
``` ```
{ {
<buildername>: [ <buildername>: {
{ 'tests': [
'name': <test-spec name>, {
'variant': <variant name>, 'name': <test-spec name>,
'shards': <number of shards>, 'variant': <variant name>,
}, 'shards': <number of shards>,
... },
], ...
],
},
... ...
} }
``` ```
@ -36,9 +38,11 @@ the swarming shards for long-running tests.
Example: Example:
``` ```
{ {
'v8_linux64_rel_ng_triggered': [ 'v8_linux64_rel_ng_triggered': {
{'name': 'v8testing', 'variant': 'nooptimization', 'shards': 2}, 'tests': [
], {'name': 'v8testing', 'variant': 'nooptimization', 'shards': 2},
],
},
} }
``` ```

View File

@ -4,45 +4,65 @@
{ {
### Example configuration for CI bots (please keep as reference). ### Example configuration for CI bots (please keep as reference).
# 'V8 Linux64': [ # 'V8 Linux64': {
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1}, # 'tests': [
# ], # {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# 'V8 Linux64 - debug': [ # ],
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1}, # },
# ], # 'V8 Linux64 - debug': {
# 'tests': [
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# ],
# },
'V8 Linux - debug': [ 'V8 Linux - debug': {
{'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1}, 'tests': [
{'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1}, {'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1},
{'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 1}, {'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1},
{'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1}, {'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 1},
], {'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1},
'V8 Linux - gc stress': [ ],
{'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2}, },
], 'V8 Linux - gc stress': {
'V8 Linux64': [ 'tests': [
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1}, {'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2},
], ],
'V8 Linux64 - debug': [ },
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1}, 'V8 Linux64': {
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, 'tests': [
], {'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
'V8 Linux64 ASAN': [ ],
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, },
], 'V8 Linux64 - debug': {
'V8 Linux64 TSAN': [ 'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, {'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
], {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
'V8 Linux64 - fyi': [ ],
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 1}, },
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 2}, 'V8 Linux64 ASAN': {
{'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1}, 'tests': [
{'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1}, {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
], ],
'V8 Linux64 - debug - fyi': [ },
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2}, 'V8 Linux64 TSAN': {
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 3}, 'tests': [
{'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1}, {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
{'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1}, ],
], },
'V8 Linux64 - fyi': {
'tests': [
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 1},
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 2},
{'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1},
{'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1},
],
},
'V8 Linux64 - debug - fyi': {
'tests': [
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2},
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 3},
{'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1},
{'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1},
],
},
} }

View File

@ -4,27 +4,39 @@
{ {
### Example configuration for trybots (please keep as reference). ### Example configuration for trybots (please keep as reference).
# 'v8_linux64_rel_ng_triggered': [ # 'v8_linux64_rel_ng_triggered': {
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1}, # 'tests': [
# ], # {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# ],
# },
'v8_linux64_fyi_rel_ng_triggered': [ 'v8_linux64_fyi_rel_ng_triggered': {
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2}, 'tests': [
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 2}, {'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2},
{'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1}, {'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 2},
{'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1}, {'name': 'mjsunit', 'variant': 'stress_sampling', 'shards': 1},
], {'name': 'webkit', 'variant': 'stress_sampling', 'shards': 1},
'v8_linux64_rel_ng_triggered': [ ],
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1}, },
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, 'v8_linux64_rel_ng_triggered': {
], 'tests': [
'v8_linux_gc_stress_dbg': [ {'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
{'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2}, {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
], ],
'v8_linux64_asan_rel_ng_triggered': [ },
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, 'v8_linux_gc_stress_dbg': {
], 'tests': [
'v8_linux64_tsan_rel': [ {'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2},
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, ],
], },
'v8_linux64_asan_rel_ng_triggered': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
'v8_linux64_tsan_rel': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
} }