Skip to content

GitLab

T
tangled
Commit 7f9bf64f authored by Yun Liu's avatar Yun Liu Committed by Commit Bot
Browse files
Options

Add more tests for android-code-coverage 

Also change to use mixin for existing bots.


Bug: 967011,961808
Change-Id: I68334b0c223a12ee0e0db48a86256ff20fbe0058
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1649057Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Yun Liu <yliuyliu@google.com>
Cr-Commit-Position: refs/heads/master@{#667262}
parent 454fdc50
Hide whitespace changes
Inline Side-by-side
Showing with 3298 additions and 84 deletions
testing/buildbot/chromium.fyi.json
View file @ 7f9bf64f
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/mixins.pyl
View file @ 7f9bf64f
...@@ -210,6 +210,13 @@ ...@@ -210,6 +210,13 @@
}, },
}, },
'kitkat': { 'kitkat': {
'swarming': {
'dimensions': {
'device_os': 'KTU84P',
},
},
},
'kitkat_generic': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'device_os': 'K', 'device_os': 'K',
......
testing/buildbot/test_suites.pyl
View file @ 7f9bf64f
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
'monochrome_public_test_ar_apk': {}, 'monochrome_public_test_ar_apk': {},
}, },
'android_code_coverage_junit_tests': {
'base_junit_tests': {},
},
'android_ddready_vr_gtests': { 'android_ddready_vr_gtests': {
'chrome_public_test_vr_apk-ddready-cardboard': { 'chrome_public_test_vr_apk-ddready-cardboard': {
'args': [ 'args': [
......
testing/buildbot/waterfalls.pyl
View file @ 7f9bf64f
...@@ -196,18 +196,13 @@ ...@@ -196,18 +196,13 @@
}, },
}, },
'KitKat Phone Tester (dbg)': { 'KitKat Phone Tester (dbg)': {
'mixins': [
'kitkat',
'hammerhead',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_android_gtests', 'gtest_tests': 'chromium_android_gtests',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'KitKat Tablet Tester': { 'KitKat Tablet Tester': {
...@@ -322,6 +317,10 @@ ...@@ -322,6 +317,10 @@
}, },
}, },
'android-cronet-arm-dbg': { 'android-cronet-arm-dbg': {
'mixins': [
'kitkat',
'hammerhead',
],
'additional_compile_targets': [ 'additional_compile_targets': [
'cronet_package', 'cronet_package',
'cronet_perf_test_apk', 'cronet_perf_test_apk',
...@@ -330,15 +329,6 @@ ...@@ -330,15 +329,6 @@
'gtest_tests': 'cronet_gtests', 'gtest_tests': 'cronet_gtests',
'isolated_scripts': 'cronet_dbg_isolated_scripts', 'isolated_scripts': 'cronet_dbg_isolated_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'android-cronet-arm-rel': { 'android-cronet-arm-rel': {
...@@ -382,6 +372,10 @@ ...@@ -382,6 +372,10 @@
}, },
}, },
'android-cronet-asan-arm-rel': { 'android-cronet-asan-arm-rel': {
'mixins': [
'kitkat',
'hammerhead',
],
'additional_compile_targets': [ 'additional_compile_targets': [
'cronet_package', 'cronet_package',
'cronet_perf_test_apk', 'cronet_perf_test_apk',
...@@ -389,30 +383,16 @@ ...@@ -389,30 +383,16 @@
'test_suites': { 'test_suites': {
'gtest_tests': 'cronet_gtests', 'gtest_tests': 'cronet_gtests',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'android-cronet-kitkat-arm-rel': { 'android-cronet-kitkat-arm-rel': {
'mixins': [
'kitkat',
'hammerhead',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'cronet_gtests', 'gtest_tests': 'cronet_gtests',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'android-cronet-lollipop-arm-rel': {}, 'android-cronet-lollipop-arm-rel': {},
...@@ -484,6 +464,10 @@ ...@@ -484,6 +464,10 @@
] ]
}, },
'android-kitkat-arm-rel': { 'android-kitkat-arm-rel': {
'mixins': [
'kitkat',
'hammerhead',
],
'additional_compile_targets': [ 'additional_compile_targets': [
'cronet_test_instrumentation_apk', 'cronet_test_instrumentation_apk',
'monochrome_static_initializers', 'monochrome_static_initializers',
...@@ -493,15 +477,6 @@ ...@@ -493,15 +477,6 @@
'junit_tests': 'chromium_junit_tests', 'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script', 'isolated_scripts': 'monochrome_apk_checker_isolated_script',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'android-marshmallow-arm64-rel': { 'android-marshmallow-arm64-rel': {
...@@ -566,14 +541,11 @@ ...@@ -566,14 +541,11 @@
'os_type': 'android', 'os_type': 'android',
}, },
'Memory Infra Tester': { 'Memory Infra Tester': {
'mixins': [
'kitkat',
'hammerhead',
],
'swarming': { 'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
'expiration': 36000, 'expiration': 36000,
'hard_timeout': 10800, 'hard_timeout': 10800,
'ignore_task_failure': False, 'ignore_task_failure': False,
...@@ -755,6 +727,10 @@ ...@@ -755,6 +727,10 @@
}, },
}, },
'ToTAndroid': { 'ToTAndroid': {
'mixins': [
'kitkat',
'hammerhead',
],
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'all',
], ],
...@@ -764,15 +740,6 @@ ...@@ -764,15 +740,6 @@
'junit_tests': 'chromium_junit_tests', 'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script', 'isolated_scripts': 'monochrome_apk_checker_isolated_script',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
'ToTAndroid x64': { 'ToTAndroid x64': {
...@@ -1601,10 +1568,14 @@ ...@@ -1601,10 +1568,14 @@
'android-code-coverage': { 'android-code-coverage': {
'mixins': [ 'mixins': [
'code-coverage', 'code-coverage',
'kitkat',
'hammerhead',
], ],
'test_suites': { 'test_suites': {
'junit_tests': 'android_code_coverage_junit_tests', 'gtest_tests': 'chromium_android_gtests',
} 'junit_tests': 'chromium_junit_tests',
},
'os_type': 'android',
}, },
'android-mojo-webview-rel': { 'android-mojo-webview-rel': {
'swarming': { 'swarming': {
...@@ -3843,17 +3814,14 @@ ...@@ -3843,17 +3814,14 @@
'name': 'chromium.swarm', 'name': 'chromium.swarm',
'machines': { 'machines': {
'Android N5 Swarm': { 'Android N5 Swarm': {
'mixins': [
'kitkat',
'hammerhead',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_swarm_android_gtests', 'gtest_tests': 'chromium_swarm_android_gtests',
}, },
'swarming': { 'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
'expiration': 10800, 'expiration': 10800,
}, },
'os_type': 'android', 'os_type': 'android',
...@@ -4029,7 +3997,7 @@ ...@@ -4029,7 +3997,7 @@
'WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)': { 'WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)': {
'os_type': 'android', 'os_type': 'android',
'mixins': [ 'mixins': [
'kitkat', 'kitkat_generic',
'hammerhead', 'hammerhead',
], ],
'test_suites': { 'test_suites': {
...@@ -4374,19 +4342,14 @@ ...@@ -4374,19 +4342,14 @@
'name': 'tryserver.chromium.android', 'name': 'tryserver.chromium.android',
'machines': { 'machines': {
'android_blink_rel': { 'android_blink_rel': {
'mixins': [
'kitkat',
'hammerhead',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_android_webkit_gtests', 'gtest_tests': 'chromium_android_webkit_gtests',
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
'os': 'Android',
},
],
},
'os_type': 'android', 'os_type': 'android',
}, },
}, },
......
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