Skip to content

GitLab

T
tangled
Commit a7b9f515 authored by Andrew Luo's avatar Andrew Luo Committed by Commit Bot
Browse files
Options

Reland "Switch webview bots to google devices." 

This is a reland of 621bb15a

Original change's description:
> Switch webview bots to google devices.
> 
> Bug: 814405
> Change-Id: I217f731c39f9ad0576ce98236c7c7dc78cf71dd4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592874
> Commit-Queue: Andrew Luo <aluo@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#663371}

Bug: 814405
Change-Id: I94d5ea313108a0105a8658daae4f20c320beba9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632901Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Andrew Luo <aluo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664612}
parent 7e6d96d0
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 38 deletions
testing/buildbot/chromium.android.fyi.json
View file @ a7b9f515
...@@ -35,9 +35,10 @@ ...@@ -35,9 +35,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "OPD3.170816.023", "device_os": "OPR3.170623.008",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "walleye", "device_type": "marlin",
"os": "Android" "os": "Android"
} }
], ],
......
testing/buildbot/chromium.android.json
View file @ a7b9f515
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "LMY47I", "device_os": "LMY48I",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -82,7 +83,8 @@ ...@@ -82,7 +83,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "LMY47I", "device_os": "LMY48I",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -127,7 +129,8 @@ ...@@ -127,7 +129,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "LMY47I", "device_os": "LMY48I",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android"
...@@ -175,10 +178,10 @@ ...@@ -175,10 +178,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "MRA58Z", "device_os": "MMB29Q",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
} }
], ],
...@@ -225,10 +228,10 @@ ...@@ -225,10 +228,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "MRA58Z", "device_os": "MMB29Q",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
} }
], ],
...@@ -271,10 +274,10 @@ ...@@ -271,10 +274,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "MRA58Z", "device_os": "MMB29Q",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
} }
], ],
...@@ -320,8 +323,8 @@ ...@@ -320,8 +323,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "NMF27E", "device_os": "NRD90M",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
...@@ -370,8 +373,8 @@ ...@@ -370,8 +373,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "NMF27E", "device_os": "NRD90M",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
...@@ -416,8 +419,8 @@ ...@@ -416,8 +419,8 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "NMF27E", "device_os": "NRD90M",
"device_os_flavor": "aosp", "device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android"
...@@ -465,9 +468,10 @@ ...@@ -465,9 +468,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "OPD3.170816.023", "device_os": "OPR3.170623.008",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "walleye", "device_type": "marlin",
"os": "Android" "os": "Android"
} }
], ],
...@@ -514,9 +518,10 @@ ...@@ -514,9 +518,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "OPD3.170816.023", "device_os": "OPR3.170623.008",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "walleye", "device_type": "marlin",
"os": "Android" "os": "Android"
} }
], ],
...@@ -559,9 +564,10 @@ ...@@ -559,9 +564,10 @@
], ],
"dimension_sets": [ "dimension_sets": [
{ {
"device_os": "OPD3.170816.023", "device_os": "OPR3.170623.008",
"device_os_flavor": "google",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "walleye", "device_type": "marlin",
"os": "Android" "os": "Android"
} }
], ],
......
testing/buildbot/waterfalls.pyl
View file @ a7b9f515
...@@ -96,7 +96,9 @@ ...@@ -96,7 +96,9 @@
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
{ {
'device_os': 'LMY47I', 'device_os': 'LMY48I',
'device_os_flavor': 'google',
'device_os_type': 'userdebug',
'device_type': 'hammerhead', 'device_type': 'hammerhead',
'os': 'Android', 'os': 'Android',
}, },
...@@ -112,9 +114,10 @@ ...@@ -112,9 +114,10 @@
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
{ {
'device_os': 'MRA58Z', 'device_os': 'MMB29Q',
'device_os_flavor': 'aosp', 'device_os_flavor': 'google',
'device_type': 'hammerhead', 'device_os_type': 'userdebug',
'device_type': 'bullhead',
'os': 'Android', 'os': 'Android',
}, },
], ],
...@@ -129,8 +132,9 @@ ...@@ -129,8 +132,9 @@
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
{ {
'device_os': 'NMF27E', 'device_os': 'NRD90M',
'device_os_flavor': 'aosp', 'device_os_flavor': 'google',
'device_os_type': 'userdebug',
'device_type': 'bullhead', 'device_type': 'bullhead',
'os': 'Android', 'os': 'Android',
}, },
...@@ -146,8 +150,10 @@ ...@@ -146,8 +150,10 @@
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
{ {
'device_os': 'OPD3.170816.023', 'device_os': 'OPR3.170623.008',
'device_type': 'walleye', 'device_os_flavor': 'google',
'device_os_type': 'userdebug',
'device_type': 'marlin',
'os': 'Android', 'os': 'Android',
}, },
], ],
...@@ -547,8 +553,9 @@ ...@@ -547,8 +553,9 @@
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
{ {
'device_os': 'OPD3.170816.023', 'device_os': 'OPR3.170623.008',
'device_type': 'walleye', 'device_os_flavor': 'google',
'device_type': 'marlin',
'os': 'Android', 'os': 'Android',
}, },
], ],
......
tools/mb/mb_config.pyl
View file @ a7b9f515
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
'chromium.android': { 'chromium.android': {
'Android ASAN (dbg)': 'android_clang_asan_debug_bot', 'Android ASAN (dbg)': 'android_clang_asan_debug_bot',
'Android arm Builder (dbg)': 'android_debug_static_bot', 'Android arm Builder (dbg)': 'android_webview_google_debug_static_bot',
'Android arm64 Builder (dbg)': 'android_debug_static_bot_arm64', 'Android arm64 Builder (dbg)': 'android_webview_google_debug_static_bot_arm64',
'Android x64 Builder (dbg)': 'android_debug_static_bot_x64', 'Android x64 Builder (dbg)': 'android_debug_static_bot_x64',
'Android x86 Builder (dbg)': 'android_debug_static_bot_x86', 'Android x86 Builder (dbg)': 'android_debug_static_bot_x86',
'Cast Android (dbg)': 'android_cast_debug_static_bot', 'Cast Android (dbg)': 'android_cast_debug_static_bot',
...@@ -1083,6 +1083,14 @@ ...@@ -1083,6 +1083,14 @@
'android_without_codecs', 'shared_release_bot', 'x64', 'dcheck_always_on', 'android_without_codecs', 'shared_release_bot', 'x64', 'dcheck_always_on',
], ],
'android_webview_google_debug_static_bot': [
'android', 'debug_static_bot', 'webview_google',
],
'android_webview_google_debug_static_bot_arm64': [
'android', 'debug_static_bot', 'arm64', 'webview_google',
],
'android_without_codecs_debug_bot': [ 'android_without_codecs_debug_bot': [
'android_without_codecs', 'debug_bot', 'android_without_codecs', 'debug_bot',
], ],
...@@ -2406,6 +2414,10 @@ ...@@ -2406,6 +2414,10 @@
'gn_args': 'android32_ndk_api_level=26 android64_ndk_api_level=26', 'gn_args': 'android32_ndk_api_level=26 android64_ndk_api_level=26',
}, },
'webview_google': {
'gn_args': 'system_webview_package_name="com.google.android.webview"',
},
'win_cross': { 'win_cross': {
'gn_args': 'target_os="win"', 'gn_args': 'target_os="win"',
}, },
......
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