Commit 69a4dedf authored by Sajjad Mirza's avatar Sajjad Mirza Committed by Commit Bot

[code coverage] Set up Windows 10 coverage builder.

Also extract common full-codebase coverage properties to a mixin.

Bug: 1010702
Change-Id: If60cc49c9040702e4f8138d46af74bbd89e204d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834951
Commit-Queue: Sajjad Mirza <sajjadm@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarNodir Turakulov <nodir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704919}
parent 1925b354
...@@ -960,6 +960,14 @@ builder_mixins { ...@@ -960,6 +960,14 @@ builder_mixins {
dimensions: "ssd:0" dimensions: "ssd:0"
} }
builder_mixins {
name: "full-codebase-coverage"
mixins: "code-coverage"
mixins: "builderless"
dimensions: "ssd:1"
dimensions: "cores:32"
}
buckets { buckets {
name: "ci" name: "ci"
acl_sets: "ci" acl_sets: "ci"
...@@ -1197,12 +1205,9 @@ buckets { ...@@ -1197,12 +1205,9 @@ buckets {
builders { builders {
name: "android-code-coverage" name: "android-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "java-coverage" mixins: "java-coverage"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -1543,13 +1548,9 @@ buckets { ...@@ -1543,13 +1548,9 @@ buckets {
builders { builders {
name: "chromeos-vm-code-coverage" name: "chromeos-vm-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "clang-coverage" mixins: "clang-coverage"
mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -1567,13 +1568,9 @@ buckets { ...@@ -1567,13 +1568,9 @@ buckets {
builders { builders {
name: "linux-chromeos-code-coverage" name: "linux-chromeos-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "clang-coverage" mixins: "clang-coverage"
mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -2284,6 +2281,12 @@ buckets { ...@@ -2284,6 +2281,12 @@ buckets {
mixins: "win-ci" mixins: "win-ci"
mixins: "deterministic" mixins: "deterministic"
} }
builders {
name: "win10-code-coverage"
mixins: "full-codebase-coverage"
mixins: "clang-coverage"
dimensions: "os:Windows-10"
}
# chromium.clang # chromium.clang
builders { builders {
......
...@@ -960,6 +960,14 @@ builder_mixins { ...@@ -960,6 +960,14 @@ builder_mixins {
dimensions: "ssd:0" dimensions: "ssd:0"
} }
builder_mixins {
name: "full-codebase-coverage"
mixins: "code-coverage"
mixins: "builderless"
dimensions: "ssd:1"
dimensions: "cores:32"
}
buckets { buckets {
name: "ci" name: "ci"
acl_sets: "ci" acl_sets: "ci"
...@@ -1197,12 +1205,9 @@ buckets { ...@@ -1197,12 +1205,9 @@ buckets {
builders { builders {
name: "android-code-coverage" name: "android-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "java-coverage" mixins: "java-coverage"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -1543,13 +1548,9 @@ buckets { ...@@ -1543,13 +1548,9 @@ buckets {
builders { builders {
name: "chromeos-vm-code-coverage" name: "chromeos-vm-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "clang-coverage" mixins: "clang-coverage"
mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -1567,13 +1568,9 @@ buckets { ...@@ -1567,13 +1568,9 @@ buckets {
builders { builders {
name: "linux-chromeos-code-coverage" name: "linux-chromeos-code-coverage"
mixins: "code-coverage" mixins: "full-codebase-coverage"
mixins: "clang-coverage" mixins: "clang-coverage"
mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
dimensions: "cores:32"
dimensions: "ssd:1"
} }
builders { builders {
...@@ -2284,6 +2281,12 @@ buckets { ...@@ -2284,6 +2281,12 @@ buckets {
mixins: "win-ci" mixins: "win-ci"
mixins: "deterministic" mixins: "deterministic"
} }
builders {
name: "win10-code-coverage"
mixins: "full-codebase-coverage"
mixins: "clang-coverage"
dimensions: "os:Windows-10"
}
# chromium.clang # chromium.clang
builders { builders {
......
...@@ -2178,6 +2178,11 @@ consoles { ...@@ -2178,6 +2178,11 @@ consoles {
category: "code_coverage" category: "code_coverage"
short_name: "ios" short_name: "ios"
} }
builders {
name: "buildbucket/luci.chromium.ci/win10-code-coverage"
category: "code_coverage"
short_name: "win"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios-simulator-cronet" name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
category: "cronet" category: "cronet"
......
...@@ -401,6 +401,7 @@ trigger { ...@@ -401,6 +401,7 @@ trigger {
triggers: "win-jumbo-rel" triggers: "win-jumbo-rel"
triggers: "win-archive-rel" triggers: "win-archive-rel"
triggers: "win-pixel-builder-rel" triggers: "win-pixel-builder-rel"
triggers: "win10-code-coverage" # TODO(crbug.com/1010732) Move when stable.
triggers: "win32-arm64-rel" triggers: "win32-arm64-rel"
triggers: "win32-archive-dbg" triggers: "win32-archive-dbg"
triggers: "win32-archive-rel" triggers: "win32-archive-rel"
...@@ -3213,6 +3214,16 @@ job { ...@@ -3213,6 +3214,16 @@ job {
} }
} }
job {
id: "win10-code-coverage"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "win10-code-coverage"
}
}
job { job {
id: "win-asan" id: "win-asan"
acl_sets: "default" acl_sets: "default"
......
...@@ -2178,6 +2178,11 @@ consoles { ...@@ -2178,6 +2178,11 @@ consoles {
category: "code_coverage" category: "code_coverage"
short_name: "ios" short_name: "ios"
} }
builders {
name: "buildbucket/luci.chromium.ci/win10-code-coverage"
category: "code_coverage"
short_name: "win"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios-simulator-cronet" name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
category: "cronet" category: "cronet"
......
...@@ -401,6 +401,7 @@ trigger { ...@@ -401,6 +401,7 @@ trigger {
triggers: "win-jumbo-rel" triggers: "win-jumbo-rel"
triggers: "win-archive-rel" triggers: "win-archive-rel"
triggers: "win-pixel-builder-rel" triggers: "win-pixel-builder-rel"
triggers: "win10-code-coverage" # TODO(crbug.com/1010732) Move when stable.
triggers: "win32-arm64-rel" triggers: "win32-arm64-rel"
triggers: "win32-archive-dbg" triggers: "win32-archive-dbg"
triggers: "win32-archive-rel" triggers: "win32-archive-rel"
...@@ -3213,6 +3214,16 @@ job { ...@@ -3213,6 +3214,16 @@ job {
} }
} }
job {
id: "win10-code-coverage"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "win10-code-coverage"
}
}
job { job {
id: "win-asan" id: "win-asan"
acl_sets: "default" acl_sets: "default"
......
This diff is collapsed.
...@@ -2058,6 +2058,14 @@ ...@@ -2058,6 +2058,14 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
}, },
'win10-code-coverage': {
'mixins': [
'code-coverage',
],
'test_suites': {
'gtest_tests': 'chromium_win_gtests',
}
},
'win32-archive-rel-goma-canary-localoutputcache': { 'win32-archive-rel-goma-canary-localoutputcache': {
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'all',
......
...@@ -327,6 +327,7 @@ ...@@ -327,6 +327,7 @@
'win-password-manager-captured-sites-rel': 'release_bot', 'win-password-manager-captured-sites-rel': 'release_bot',
'win-pixel-builder-rel': 'release_bot', 'win-pixel-builder-rel': 'release_bot',
'win32-arm64-rel': 'win32_arm64_release_bot', 'win32-arm64-rel': 'win32_arm64_release_bot',
'win10-code-coverage': 'clang_code_coverage_nofuzzer',
}, },
'chromium.goma': { 'chromium.goma': {
...@@ -1323,6 +1324,10 @@ ...@@ -1323,6 +1324,10 @@
'use_clang_coverage', 'debug_static_bot', 'x64', 'ios' 'use_clang_coverage', 'debug_static_bot', 'x64', 'ios'
], ],
'clang_code_coverage_nofuzzer': [
'release_bot', 'clang', 'use_clang_coverage', 'no_symbols',
],
'clang_tot_asan_lsan_static_release': [ 'clang_tot_asan_lsan_static_release': [
'clang_tot', 'asan', 'lsan', 'static', 'release', 'clang_tot', 'asan', 'lsan', 'static', 'release',
], ],
......
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