Commit 46044a45 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[test] Merge test-spec files

This merges all test specs into one master-independent
builders.pyl file, which will unblock deprecating the master name as
a property on infra side.

Bug: chromium:830557
Change-Id: I0592505e77ede725ed43a26cabfd057bb0b911bd
Reviewed-on: https://chromium-review.googlesource.com/1046671Reviewed-by: 's avatarSergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53017}
parent 96186c4f
...@@ -165,16 +165,15 @@ def CheckChangeOnCommit(input_api, output_api): ...@@ -165,16 +165,15 @@ def CheckChangeOnCommit(input_api, output_api):
# Calculate which files are affected. # Calculate which files are affected.
if input_api.AffectedFiles(False, file_filter(r'.*PRESUBMIT\.py')): if input_api.AffectedFiles(False, file_filter(r'.*PRESUBMIT\.py')):
# If PRESUBMIT.py itself was changed, check all configs. # If PRESUBMIT.py itself was changed, check also the test spec.
affected_files = [ affected_files = [
f for f in os.listdir(input_api.PresubmitLocalPath()) os.path.join(input_api.PresubmitLocalPath(), 'builders.pyl'),
if f.endswith('.pyl')
] ]
else: else:
# Otherwise, check only changed configs. # Otherwise, check test spec only when changed.
affected_files = [ affected_files = [
f.AbsoluteLocalPath() f.AbsoluteLocalPath()
for f in input_api.AffectedFiles(False, file_filter(r'.+\.pyl')) for f in input_api.AffectedFiles(False, file_filter(r'.*builders\.pyl'))
] ]
errors = [] errors = []
......
...@@ -7,11 +7,10 @@ variants specified [here](https://chromium.googlesource.com/v8/v8/+/master/tools ...@@ -7,11 +7,10 @@ variants specified [here](https://chromium.googlesource.com/v8/v8/+/master/tools
Changes to src-side test specifications go through CQ like any other CL and Changes to src-side test specifications go through CQ like any other CL and
require tests added for specific trybots to pass. require tests added for specific trybots to pass.
The test specifications are defined in a V8-side folder called infra/testing. The test specifications are defined in a V8-side python-literal file
Every master has an optional file named `<mastername>.pyl`. E.g. `infra/testing/builders.pyl`.
`tryserver.v8.pyl`.
The structure of each file is: The structure of the file is:
``` ```
{ {
<buildername>: { <buildername>: {
......
# Copyright 2017 The V8 project authors. All rights reserved. # Copyright 2018 The V8 project authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
{ {
### Example configuration for trybots (please keep as reference). ##############################################################################
# 'v8_linux64_rel_ng_triggered': { ### luci.v8.try
# 'tests': [
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# ],
# },
############################################################################## ##############################################################################
# Linux32 # Linux32
'v8_linux_dbg_ng_triggered': { 'v8_linux_dbg_ng_triggered': {
...@@ -257,4 +252,60 @@ ...@@ -257,4 +252,60 @@
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
], ],
}, },
##############################################################################
### luci.v8.ci
##############################################################################
# Linux32
'V8 Linux - debug': {
'tests': [
{'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1},
{'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1},
{'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 1},
{'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1},
],
},
'V8 Linux - gc stress': {
'tests': [
{'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2},
],
},
##############################################################################
# Linux64
'V8 Linux64': {
'tests': [
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
],
},
'V8 Linux64 - debug': {
'tests': [
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
{'name': 'v8testing', 'variant': 'slow_path', '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},
],
},
'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 ASAN': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
'V8 Linux64 TSAN': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
} }
# Copyright 2017 The V8 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.
{
### Example configuration for CI bots (please keep as reference).
# 'V8 Linux64': {
# 'tests': [
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# ],
# },
# 'V8 Linux64 - debug': {
# 'tests': [
# {'name': 'benchmarks', 'variant': 'default', 'shards': 1},
# ],
# },
'V8 Linux - debug': {
'tests': [
{'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1},
{'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1},
{'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 1},
{'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1},
],
},
'V8 Linux - gc stress': {
'tests': [
{'name': 'mjsunit', 'variant': 'slow_path', 'shards': 2},
],
},
'V8 Linux64': {
'tests': [
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
],
},
'V8 Linux64 - debug': {
'tests': [
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
'V8 Linux64 ASAN': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
],
},
'V8 Linux64 TSAN': {
'tests': [
{'name': 'v8testing', 'variant': 'slow_path', '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},
],
},
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment