Commit 18e6fc1d authored by Roberto Carrillo's avatar Roberto Carrillo Committed by Commit Bot

[code coverage] Split linux-code-coverage-generation as builder/tester.

Since our primary objective is to reduce the cycle time for repo-wide
code coverage reports, we'd do better to have compilation and test
running on separate builders.

R=stgao,liaoyuke,jbudorick

Bug: 896446
Change-Id: Ic8b7f6319b208405a310694134da6011b485d8f1
Reviewed-on: https://chromium-review.googlesource.com/c/1289075
Commit-Queue: Roberto Carrillo <robertocn@chromium.org>
Reviewed-by: default avatarShuotao Gao <stgao@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601395}
parent a96e07f5
...@@ -1848,7 +1848,12 @@ buckets { ...@@ -1848,7 +1848,12 @@ buckets {
# Code coverage reports generation bots. # Code coverage reports generation bots.
builders { builders {
name: "linux-code-coverage-generation" name: "linux-code-coverage-builder"
mixins: "code-coverage"
dimensions: "cores:32"
}
builders {
name: "linux-code-coverage-tester"
mixins: "code-coverage" mixins: "code-coverage"
dimensions: "cores:32" dimensions: "cores:32"
} }
......
...@@ -2446,9 +2446,14 @@ consoles { ...@@ -2446,9 +2446,14 @@ consoles {
category: "closure_compilation" category: "closure_compilation"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/linux-code-coverage-generation" name: "buildbucket/luci.chromium.ci/linux-code-coverage-builder"
category: "code_coverage" category: "code_coverage|linux"
short_name: "linux" short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/linux-code-coverage-tester"
category: "code_coverage|linux"
short_name: "tst"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation" name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
...@@ -2805,9 +2810,14 @@ consoles { ...@@ -2805,9 +2810,14 @@ consoles {
category: "closure_compilation" category: "closure_compilation"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/linux-code-coverage-generation" name: "buildbucket/luci.chromium.ci/linux-code-coverage-builder"
category: "code_coverage" category: "code_coverage|linux"
short_name: "linux" short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/linux-code-coverage-tester"
category: "code_coverage|linux"
short_name: "tst"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation" name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
......
...@@ -308,7 +308,7 @@ trigger { ...@@ -308,7 +308,7 @@ trigger {
triggers: "linux-chromeos-dbg" triggers: "linux-chromeos-dbg"
triggers: "linux-chromeos-rel" triggers: "linux-chromeos-rel"
triggers: "linux-chromium-tests-staging-builder" triggers: "linux-chromium-tests-staging-builder"
triggers: "linux-code-coverage-generation" triggers: "linux-code-coverage-builder"
triggers: "linux-dbg" triggers: "linux-dbg"
triggers: "linux-gcc-rel" triggers: "linux-gcc-rel"
triggers: "linux-jumbo-rel" triggers: "linux-jumbo-rel"
...@@ -1538,12 +1538,23 @@ job { ...@@ -1538,12 +1538,23 @@ job {
} }
job { job {
id: "linux-code-coverage-generation" id: "linux-code-coverage-builder"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "linux-code-coverage-generation" builder: "linux-code-coverage-builder"
}
}
job {
id: "linux-code-coverage-tester"
# Triggered by "linux-code-coverage-buidler".
acl_sets: "triggered-by-parent-builders"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "linux-code-coverage-tester"
} }
} }
......
...@@ -5747,7 +5747,7 @@ ...@@ -5747,7 +5747,7 @@
} }
] ]
}, },
"linux-code-coverage-generation": { "linux-code-coverage-tester": {
"gtest_tests": [ "gtest_tests": [
{ {
"isolate_coverage_data": true, "isolate_coverage_data": true,
......
...@@ -1375,7 +1375,7 @@ ...@@ -1375,7 +1375,7 @@
'isolated_scripts': 'chromium_linux_rel_isolated_scripts', 'isolated_scripts': 'chromium_linux_rel_isolated_scripts',
}, },
}, },
'linux-code-coverage-generation': { 'linux-code-coverage-tester': {
'mixins': [ 'mixins': [
'code-coverage', 'code-coverage',
], ],
......
...@@ -230,7 +230,8 @@ ...@@ -230,7 +230,8 @@
'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking', 'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking',
'linux-blink-heap-verification': 'release_bot_enable_blink_heap_verification_dcheck_always_on', 'linux-blink-heap-verification': 'release_bot_enable_blink_heap_verification_dcheck_always_on',
'linux-chromium-tests-staging-builder': 'release_bot', 'linux-chromium-tests-staging-builder': 'release_bot',
'linux-code-coverage-generation': 'clang_code_coverage', 'linux-code-coverage-builder': 'clang_code_coverage',
'linux-code-coverage-tester': 'clang_code_coverage',
'Mac deterministic': 'release_bot_mac_strip', 'Mac deterministic': 'release_bot_mac_strip',
'Mac deterministic (dbg)': 'debug_bot', 'Mac deterministic (dbg)': 'debug_bot',
......
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