Commit 4c95872c authored by Zhaoyang Li's avatar Zhaoyang Li Committed by Commit Bot

[resultdb][iOS] Re-enable ResultDB on all iOS builders.

As the bug is fixed, enable ResultDB in all iOS builders. This change
reverts crrev/c/2465924, crrev/c/2536932, crrev/c/2551288.

Bug: 1136998
Change-Id: I7cd8f397a51f5d041b932598ead014c3bdc654e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2558787Reviewed-by: default avatarChan Li <chanli@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830852}
parent 20748934
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -3618,44 +3618,44 @@ ...@@ -3618,44 +3618,44 @@
}, },
'ios_clang_tests': { 'ios_clang_tests': {
'absl_hardening_tests': {'resultdb':{'enable':False}}, 'absl_hardening_tests': {},
'base_unittests': {'resultdb':{'enable':False}}, 'base_unittests': {},
'boringssl_crypto_tests': {'resultdb':{'enable':False}}, 'boringssl_crypto_tests': {},
'boringssl_ssl_tests': {'resultdb':{'enable':False}}, 'boringssl_ssl_tests': {},
'components_unittests': {'resultdb':{'enable':False}}, 'components_unittests': {},
'crypto_unittests': {'resultdb':{'enable':False}}, 'crypto_unittests': {},
'gfx_unittests': {'resultdb':{'enable':False}}, 'gfx_unittests': {},
'google_apis_unittests': {'resultdb':{'enable':False}}, 'google_apis_unittests': {},
'ios_chrome_unittests': {'resultdb':{'enable':False}}, 'ios_chrome_unittests': {},
'ios_net_unittests': {'resultdb':{'enable':False}}, 'ios_net_unittests': {},
'ios_web_inttests': {'resultdb':{'enable':False}}, 'ios_web_inttests': {},
'ios_web_unittests': {'resultdb':{'enable':False}}, 'ios_web_unittests': {},
'ios_web_view_inttests': {'resultdb':{'enable':False}}, 'ios_web_view_inttests': {},
'net_unittests': {'resultdb':{'enable':False}}, 'net_unittests': {},
'skia_unittests': {'resultdb':{'enable':False}}, 'skia_unittests': {},
'sql_unittests': {'resultdb':{'enable':False}}, 'sql_unittests': {},
'ui_base_unittests': {'resultdb':{'enable':False}}, 'ui_base_unittests': {},
'url_unittests': {'resultdb':{'enable':False}}, 'url_unittests': {},
}, },
'ios_common_tests': { 'ios_common_tests': {
'absl_hardening_tests': {'resultdb':{'enable':False}}, 'absl_hardening_tests': {},
'boringssl_crypto_tests': {'resultdb':{'enable':False}}, 'boringssl_crypto_tests': {},
'boringssl_ssl_tests': {'resultdb':{'enable':False}}, 'boringssl_ssl_tests': {},
'crypto_unittests': {'resultdb':{'enable':False}}, 'crypto_unittests': {},
'google_apis_unittests': {'resultdb':{'enable':False}}, 'google_apis_unittests': {},
'ios_components_unittests': {'resultdb':{'enable':False}}, 'ios_components_unittests': {},
'ios_net_unittests': {'resultdb':{'enable':False}}, 'ios_net_unittests': {},
'ios_remoting_unittests': {'resultdb':{'enable':False}}, 'ios_remoting_unittests': {},
'ios_testing_unittests': {'resultdb':{'enable':False}}, 'ios_testing_unittests': {},
'net_unittests': {'resultdb':{'enable':False}}, 'net_unittests': {},
'services_unittests': {'resultdb':{'enable':False}}, 'services_unittests': {},
'sql_unittests': {'resultdb':{'enable':False}}, 'sql_unittests': {},
'url_unittests': {'resultdb':{'enable':False}}, 'url_unittests': {},
}, },
'ios_cronet_tests': { 'ios_cronet_tests': {
'cronet_test': {'resultdb':{'enable':False}}, 'cronet_test': {},
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
...@@ -3663,48 +3663,39 @@ ...@@ -3663,48 +3663,39 @@
'swarming': { 'swarming': {
'shards': 3, 'shards': 3,
}, },
'resultdb': {
'enable': False,
},
}, },
'ios_chrome_signin_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_chrome_signin_eg2tests_module': {},
'ios_chrome_ui_eg2tests_module': { 'ios_chrome_ui_eg2tests_module': {
'swarming': { 'swarming': {
'shards': 5, 'shards': 5,
}, },
'resultdb': {
'enable': False,
},
}, },
'ios_web_shell_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_web_shell_eg2tests_module': {},
}, },
'ios_eg2_tests': { 'ios_eg2_tests': {
'ios_chrome_bookmarks_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_chrome_bookmarks_eg2tests_module': {},
'ios_chrome_settings_eg2tests_module': { 'ios_chrome_settings_eg2tests_module': {
'swarming': { 'swarming': {
'shards': 3, 'shards': 3,
}, },
'resultdb': {
'enable': False,
},
}, },
'ios_chrome_smoke_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_chrome_smoke_eg2tests_module': {},
'ios_chrome_web_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_chrome_web_eg2tests_module': {},
'ios_showcase_eg2tests_module': {'resultdb':{'enable':False}}, 'ios_showcase_eg2tests_module': {},
}, },
'ios_screen_size_dependent_tests': { 'ios_screen_size_dependent_tests': {
'base_unittests': {'resultdb':{'enable':False}}, 'base_unittests': {},
'components_unittests': {'resultdb':{'enable':False}}, 'components_unittests': {},
'gfx_unittests': {'resultdb':{'enable':False}}, 'gfx_unittests': {},
'ios_chrome_unittests': {'resultdb':{'enable':False}}, 'ios_chrome_unittests': {},
'ios_web_inttests': {'resultdb':{'enable':False}}, 'ios_web_inttests': {},
'ios_web_unittests': {'resultdb':{'enable':False}}, 'ios_web_unittests': {},
'ios_web_view_inttests': {'resultdb':{'enable':False}}, 'ios_web_view_inttests': {},
'ios_web_view_unittests': {'resultdb':{'enable':False}}, 'ios_web_view_unittests': {},
'skia_unittests': {'resultdb':{'enable':False}}, 'skia_unittests': {},
'ui_base_unittests': {'resultdb':{'enable':False}}, 'ui_base_unittests': {},
}, },
# END tests which run on the GPU bots # END tests which run on the GPU bots
......
...@@ -2362,7 +2362,6 @@ ...@@ -2362,7 +2362,6 @@
}, },
'ios-asan': { 'ios-asan': {
'mixins': [ 'mixins': [
'enable_resultdb',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
...@@ -2375,7 +2374,6 @@ ...@@ -2375,7 +2374,6 @@
}, },
'ios-simulator-code-coverage': { 'ios-simulator-code-coverage': {
'mixins': [ 'mixins': [
'enable_resultdb',
'ios_output_disabled_tests', 'ios_output_disabled_tests',
'isolate_profile_data', 'isolate_profile_data',
'mac_10.15', 'mac_10.15',
...@@ -2403,7 +2401,6 @@ ...@@ -2403,7 +2401,6 @@
}, },
'ios-simulator-cronet': { 'ios-simulator-cronet': {
'mixins': [ 'mixins': [
'enable_resultdb',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
...@@ -2429,7 +2426,6 @@ ...@@ -2429,7 +2426,6 @@
}, },
'ios-simulator-multi-window': { 'ios-simulator-multi-window': {
'mixins': [ 'mixins': [
'enable_resultdb',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
...@@ -2442,7 +2438,6 @@ ...@@ -2442,7 +2438,6 @@
}, },
'ios-webkit-tot': { 'ios-webkit-tot': {
'mixins': [ 'mixins': [
'enable_resultdb',
'ios_custom_webkit', 'ios_custom_webkit',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
...@@ -2476,7 +2471,6 @@ ...@@ -2476,7 +2471,6 @@
'all', 'all',
], ],
'mixins': [ 'mixins': [
'enable_resultdb',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
...@@ -2494,7 +2488,6 @@ ...@@ -2494,7 +2488,6 @@
'all', 'all',
], ],
'mixins': [ 'mixins': [
'enable_resultdb',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
......
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