Skip to content

GitLab

T
tangled
Commit 0e39edf4 authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot
Browse files
Options

android: Migrate the following builders to use lollipop devices. 

 - android-bfcache-rel
 - android-opus-arm-rel
 - android_blink_rel
 - android-cronet-arm-dbg
 - android-lollipop-arm-rel-swarming
 - ToTAndroid

Also add cronet-gtests to the builder android-cronet-lollipop-arm-rel

The following builders are not migrated for now since
they are no working properly with Lollipop:
 - android-cronet-asan-arm-rel
 - android-asan


Bug: 1032336, 1074410
Change-Id: I3186742244be821ca22f5481f0e652b0b3477410
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2168797
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763481}
parent 5517376a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 994 additions and 343 deletions
testing/buildbot/chrome.ci.json
View file @ 0e39edf4
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
......
testing/buildbot/chromium.android.fyi.json
View file @ 0e39edf4
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -601,7 +601,7 @@ ...@@ -601,7 +601,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -651,7 +651,7 @@ ...@@ -651,7 +651,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -751,7 +751,7 @@ ...@@ -751,7 +751,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -801,7 +801,7 @@ ...@@ -801,7 +801,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
......
testing/buildbot/chromium.android.json
View file @ 0e39edf4
This diff is collapsed.
testing/buildbot/chromium.ci.json
View file @ 0e39edf4
This diff is collapsed.
testing/buildbot/chromium.clang.json
View file @ 0e39edf4
This diff is collapsed.
testing/buildbot/chromium.dev.json
View file @ 0e39edf4
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android", "os": "Android",
......
testing/buildbot/chromium.memory.json
View file @ 0e39edf4
This diff is collapsed.
testing/buildbot/chromium.try.json
View file @ 0e39edf4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
......
testing/buildbot/chromium.webrtc.fyi.json
View file @ 0e39edf4
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "K|L", "device_os": "K",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
......
testing/buildbot/mixins.pyl
View file @ 0e39edf4
...@@ -295,21 +295,10 @@ ...@@ -295,21 +295,10 @@
}, },
}, },
}, },
'kitkat_or_lollipop': { 'kitkat_generic': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
# TODO(https://crbug.com/1032336) Remove the kitkat related mixins 'device_os': 'K',
# once Kitkat deprecation is finished
'device_os': 'KTU84P|LMY48M',
},
},
},
'kitkat_or_lollipop_generic': {
'swarming': {
'dimensions': {
# TODO(https://crbug.com/1032336) Remove the kitkat related mixins
# once Kitkat deprecation is finished
'device_os': 'K|L',
}, },
}, },
}, },
...@@ -409,6 +398,13 @@ ...@@ -409,6 +398,13 @@
} }
}, },
'lollipop': { 'lollipop': {
'swarming': {
'dimensions': {
'device_os': 'LMY48M',
},
},
},
'lollipop_generic': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'device_os': 'L', 'device_os': 'L',
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 0e39edf4
...@@ -2099,7 +2099,7 @@ ...@@ -2099,7 +2099,7 @@
}, },
}, },
'remove_from': [ 'remove_from': [
# There's no need to run telemetry_perf_unittests on both kitkat and # There's no need to run telemetry_perf_unittests on both lollipop and
# marshmallow on the CQ. https://crbug.com/1026487. # marshmallow on the CQ. https://crbug.com/1026487.
'android-marshmallow-arm64-rel', 'android-marshmallow-arm64-rel',
'android-pie-arm64-rel', 'android-pie-arm64-rel',
...@@ -2133,7 +2133,7 @@ ...@@ -2133,7 +2133,7 @@
'unit_tests': { 'unit_tests': {
'remove_from': [ 'remove_from': [
'android-code-coverage-native', # crbug/1018434 'android-code-coverage-native', # crbug/1018434
# There's no need to run unit_tests on both kitkat and marshmallow # There's no need to run unit_tests on both lollipop and marshmallow
# on the CQ. https://crbug.com/1026487. # on the CQ. https://crbug.com/1026487.
'android-marshmallow-arm64-rel', 'android-marshmallow-arm64-rel',
], ],
......
testing/buildbot/tryserver.chromium.android.json
View file @ 0e39edf4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "KTU84P|LMY48M", "device_os": "LMY48M",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
......
testing/buildbot/waterfalls.pyl
View file @ 0e39edf4
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
}, },
'android-cronet-arm-dbg': { 'android-cronet-arm-dbg': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'additional_compile_targets': [ 'additional_compile_targets': [
...@@ -625,8 +625,8 @@ ...@@ -625,8 +625,8 @@
}, },
'android-cronet-asan-arm-rel': { 'android-cronet-asan-arm-rel': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop',
'hammerhead', 'hammerhead',
'kitkat',
], ],
'additional_compile_targets': [ 'additional_compile_targets': [
'cronet_package', 'cronet_package',
...@@ -647,7 +647,16 @@ ...@@ -647,7 +647,16 @@
}, },
'os_type': 'android', 'os_type': 'android',
}, },
'android-cronet-lollipop-arm-rel': {}, 'android-cronet-lollipop-arm-rel': {
'mixins': [
'lollipop',
'hammerhead',
],
'test_suites': {
'gtest_tests': 'cronet_gtests',
},
'os_type': 'android',
},
'android-cronet-marshmallow-arm64-rel': { 'android-cronet-marshmallow-arm64-rel': {
'mixins': [ 'mixins': [
'marshmallow', 'marshmallow',
...@@ -708,14 +717,8 @@ ...@@ -708,14 +717,8 @@
'android-lollipop-arm-rel': { 'android-lollipop-arm-rel': {
'mixins': [ 'mixins': [
'hammerhead', 'hammerhead',
'lollipop',
], ],
'swarming': {
'dimension_sets': [
{
'device_os': 'LMY48M',
},
],
},
'additional_compile_targets': [ 'additional_compile_targets': [
'cronet_test_instrumentation_apk', 'cronet_test_instrumentation_apk',
'monochrome_static_initializers', 'monochrome_static_initializers',
...@@ -827,7 +830,7 @@ ...@@ -827,7 +830,7 @@
}, },
'android-bfcache-rel': { 'android-bfcache-rel': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'os_type': 'android', 'os_type': 'android',
...@@ -989,7 +992,7 @@ ...@@ -989,7 +992,7 @@
}, },
'ToTAndroid': { 'ToTAndroid': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'additional_compile_targets': [ 'additional_compile_targets': [
...@@ -1507,7 +1510,7 @@ ...@@ -1507,7 +1510,7 @@
'android-lollipop-arm-rel-swarming': { 'android-lollipop-arm-rel-swarming': {
'mixins': [ 'mixins': [
'chromium-template-pool', 'chromium-template-pool',
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'test_suites': { 'test_suites': {
...@@ -3015,7 +3018,7 @@ ...@@ -3015,7 +3018,7 @@
'mixins': [ 'mixins': [
'gpu_pool', 'gpu_pool',
'hammerhead', 'hammerhead',
'lollipop', 'lollipop_generic',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_fyi_android_and_mac_gtests', 'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
...@@ -3043,7 +3046,7 @@ ...@@ -3043,7 +3046,7 @@
'skip_merge_script': True, 'skip_merge_script': True,
'mixins': [ 'mixins': [
'gpu_pool', 'gpu_pool',
'lollipop', 'lollipop_generic',
'shamu', 'shamu',
], ],
'test_suites': { 'test_suites': {
...@@ -4450,7 +4453,7 @@ ...@@ -4450,7 +4453,7 @@
}, },
'mixins': [ 'mixins': [
'hammerhead', 'hammerhead',
'kitkat_or_lollipop', 'kitkat',
], ],
'os_type': 'android', 'os_type': 'android',
}, },
...@@ -4682,7 +4685,7 @@ ...@@ -4682,7 +4685,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_or_lollipop_generic', 'kitkat_generic',
'hammerhead', 'hammerhead',
], ],
'test_suites': { 'test_suites': {
...@@ -5128,7 +5131,7 @@ ...@@ -5128,7 +5131,7 @@
'machines': { 'machines': {
'android-opus-arm-rel': { 'android-opus-arm-rel': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'test_suites': { 'test_suites': {
...@@ -5138,7 +5141,7 @@ ...@@ -5138,7 +5141,7 @@
}, },
'android_blink_rel': { 'android_blink_rel': {
'mixins': [ 'mixins': [
'kitkat_or_lollipop', 'lollipop',
'hammerhead', 'hammerhead',
], ],
'test_suites': { 'test_suites': {
......
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