Commit a949be1d authored by Kunihiko Sakamoto's avatar Kunihiko Sakamoto Committed by Commit Bot

Revert "[code coverage] Bot definitions for Windows coverage tryjob"

This reverts commit 8e917b47.

Reason for revert: Causing presubmit failure with messages about the chromium.gpu waterfall configuration.
Example: https://ci.chromium.org/p/chromium/builders/try/chromium_presubmit/691375

Original change's description:
> [code coverage] Bot definitions for Windows coverage tryjob
> 
> Add definitions for tester machines for Windows coverage.
> 
> Add buildbot definitions so the tryjob can run tests.
> 
> Bug: 1033753
> Change-Id: I3d933b1beaedd24ad206c9e5d2528ed5e4496b67
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1972753
> Reviewed-by: Nodir Turakulov <nodir@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
> Commit-Queue: Sajjad Mirza <sajjadm@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#726609}

TBR=ynovikov@chromium.org,agable@chromium.org,kbr@chromium.org,nodir@chromium.org,liaoyuke@chromium.org,jbudorick@chromium.org,sajjadm@chromium.org

Change-Id: Ib343ed787d0324d1eaf796fe2ee9ca2742d1cdc4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1033753
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1976145Reviewed-by: default avatarKunihiko Sakamoto <ksakamoto@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726647}
parent 0999d9c6
This diff is collapsed.
This diff is collapsed.
...@@ -1133,12 +1133,6 @@ class BBJSONGenerator(object): ...@@ -1133,12 +1133,6 @@ class BBJSONGenerator(object):
'win32-dbg', 'win32-dbg',
'win-archive-dbg', 'win-archive-dbg',
'win32-archive-dbg', 'win32-archive-dbg',
# TODO(crbug.com/1033753) Delete these when coverage is enabled by default
# on Windows tryjobs.
'GPU Win x64 Builder Code Coverage',
'Win x64 Builder Code Coverage',
'Win10 Tests x64 Code Coverage',
'Win10 x64 Release (NVIDIA) Code Coverage',
] ]
def get_internal_waterfalls(self): def get_internal_waterfalls(self):
......
...@@ -2374,22 +2374,6 @@ ...@@ -2374,22 +2374,6 @@
# We keep this value enabled to provide minimal regression testing. # We keep this value enabled to provide minimal regression testing.
'use_multi_dimension_trigger_script': True, 'use_multi_dimension_trigger_script': True,
}, },
# TODO(crbug.com/1004523) Delete 'Win10 x64 Release (NVIDIA) Code Coverage'
# when 'Win10 x64 Release (NVIDIA)' has code coverage enabled by default.
'Win10 x64 Release (NVIDIA) Code Coverage': {
'browser_config': 'release_x64',
'os_type': 'win',
'mixins': [
'win10_nvidia_quadro_p400_stable',
'code-coverage',
],
'test_suites': {
'gtest_tests': 'gpu_win_gtests',
'gpu_telemetry_tests': 'gpu_common_win_and_linux_telemetry_tests',
},
# We keep this value enabled to provide minimal regression testing.
'use_multi_dimension_trigger_script': True,
},
}, },
}, },
{ {
...@@ -4169,19 +4153,6 @@ ...@@ -4169,19 +4153,6 @@
'scripts': 'check_network_annotations_script', 'scripts': 'check_network_annotations_script',
}, },
}, },
# TODO(crbug.com/1004523) Delete 'Win x64 Builder Code Coverage' when
# coverage is turned on in 'Win x64 Builder' by default.
'Win x64 Builder Code Coverage': {
'mixins': [
'code-coverage',
],
'additional_compile_targets': [
'pdf_fuzzers'
],
'test_suites': {
'scripts': 'check_network_annotations_script',
},
},
# 'Win10 Tests x64' and 'Win7 Tests (1)' should have the same set of # 'Win10 Tests x64' and 'Win7 Tests (1)' should have the same set of
# additional_compile_targets and test_suites. # additional_compile_targets and test_suites.
'Win10 Tests x64': { 'Win10 Tests x64': {
...@@ -4205,20 +4176,6 @@ ...@@ -4205,20 +4176,6 @@
'isolated_scripts': 'chromium_win_dbg_isolated_scripts', 'isolated_scripts': 'chromium_win_dbg_isolated_scripts',
}, },
}, },
# TODO(crbug.com/1004523) Delete 'Win10 Tests x64 Code Coverage' when
# coverage is turned on in 'Win10 Tests x64' by default.
'Win10 Tests x64 Code Coverage': {
'mixins': [
'x86-64',
'win10',
'code-coverage',
],
'test_suites': {
'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'chromium_win_rel_isolated_scripts',
'scripts': 'chromium_scripts',
},
},
'Win7 (32) Tests': { 'Win7 (32) Tests': {
'mixins': [ 'mixins': [
'x86-32', 'x86-32',
......
...@@ -380,7 +380,6 @@ ...@@ -380,7 +380,6 @@
'GPU Linux Builder': 'gpu_tests_release_trybot', 'GPU Linux Builder': 'gpu_tests_release_trybot',
'GPU Linux Builder (dbg)': 'gpu_tests_debug_bot', 'GPU Linux Builder (dbg)': 'gpu_tests_debug_bot',
'GPU Win x64 Builder': 'gpu_tests_release_trybot_resource_whitelisting', 'GPU Win x64 Builder': 'gpu_tests_release_trybot_resource_whitelisting',
'GPU Win x64 Builder Code Coverage': 'gpu_tests_release_trybot_resource_whitelisting_code_coverage',
'GPU Win x64 Builder (dbg)': 'gpu_tests_debug_bot', 'GPU Win x64 Builder (dbg)': 'gpu_tests_debug_bot',
'Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64_fastbuild', 'Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64_fastbuild',
}, },
...@@ -627,7 +626,6 @@ ...@@ -627,7 +626,6 @@
'Win Builder': 'gpu_tests_release_bot_x86_minimal_symbols', 'Win Builder': 'gpu_tests_release_bot_x86_minimal_symbols',
'Win Builder (dbg)': 'gpu_tests_debug_bot_x86', 'Win Builder (dbg)': 'gpu_tests_debug_bot_x86',
'Win x64 Builder': 'gpu_tests_release_bot_minimal_symbols', 'Win x64 Builder': 'gpu_tests_release_bot_minimal_symbols',
'Win x64 Builder Code Coverage': 'gpu_tests_release_bot_minimal_symbols_code_coverage',
'Win x64 Builder (dbg)': 'gpu_tests_debug_bot', 'Win x64 Builder (dbg)': 'gpu_tests_debug_bot',
'Windows deterministic': 'release_bot_x86_minimal_symbols', 'Windows deterministic': 'release_bot_x86_minimal_symbols',
}, },
...@@ -1671,11 +1669,6 @@ ...@@ -1671,11 +1669,6 @@
'gpu_tests', 'release_bot', 'minimal_symbols', 'gpu_tests', 'release_bot', 'minimal_symbols',
], ],
'gpu_tests_release_bot_minimal_symbols_code_coverage': [
'gpu_tests', 'release_bot', 'minimal_symbols', 'use_clang_coverage',
'partial_code_coverage_instrumentation',
],
'gpu_tests_release_bot_x86_minimal_symbols': [ 'gpu_tests_release_bot_x86_minimal_symbols': [
'gpu_tests', 'release_bot', 'x86', 'minimal_symbols', 'gpu_tests', 'release_bot', 'x86', 'minimal_symbols',
], ],
......
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