Skip to content

GitLab

T
tangled
Commit 18ea0a87 authored by Rakib M. Hasan's avatar Rakib M. Hasan Committed by Chromium LUCI CQ
Browse files
Options

weblayer, skew tests: Add new argument to pass the path to the webview APK to wrapper script 

This CL will make Android x86 M & 10 builder load the Webview Apk
with the AOSP system package name while the Android x86 Pie & Oreo
builder load the Webview Apk with the Google system package name.

Bug: 1163652
Change-Id: Icbb032a173e5c9c11255c037368f5e242a0096fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643783Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#846347}
parent ff20d2fb
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 135 deletions
testing/buildbot/chromium.android.fyi.json
View file @ 18ea0a87
...@@ -159,69 +159,7 @@ ...@@ -159,69 +159,7 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android29.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_instrumentation_test_apk_ToT_Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_apk_ToT_Tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
],
"named_caches": [
{
"name": "avd_generic_android29",
"path": ".android"
},
{
"name": "system_images_android_29_google_apis_x86",
"path": ".emulator_sdk"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_apk/"
},
{
"args": [
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -299,6 +237,7 @@ ...@@ -299,6 +237,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -376,6 +315,7 @@ ...@@ -376,6 +315,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -453,6 +393,7 @@ ...@@ -453,6 +393,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -530,6 +471,7 @@ ...@@ -530,6 +471,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -607,6 +549,7 @@ ...@@ -607,6 +549,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -688,69 +631,7 @@ ...@@ -688,69 +631,7 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_instrumentation_test_apk_ToT_Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_apk_ToT_Tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
],
"named_caches": [
{
"name": "avd_generic_android23",
"path": ".android"
},
{
"name": "system_images_android_23_google_apis_x86",
"path": ".emulator_sdk"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_apk/"
},
{
"args": [
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -828,6 +709,7 @@ ...@@ -828,6 +709,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -905,6 +787,7 @@ ...@@ -905,6 +787,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -982,6 +865,7 @@ ...@@ -982,6 +865,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1059,6 +943,7 @@ ...@@ -1059,6 +943,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1136,6 +1021,7 @@ ...@@ -1136,6 +1021,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/AOSP_SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1280,6 +1166,7 @@ ...@@ -1280,6 +1166,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1357,6 +1244,7 @@ ...@@ -1357,6 +1244,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1434,6 +1322,7 @@ ...@@ -1434,6 +1322,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1511,6 +1400,7 @@ ...@@ -1511,6 +1400,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1588,6 +1478,7 @@ ...@@ -1588,6 +1478,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1665,6 +1556,7 @@ ...@@ -1665,6 +1556,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1809,6 +1701,7 @@ ...@@ -1809,6 +1701,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1886,6 +1779,7 @@ ...@@ -1886,6 +1779,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -1963,6 +1857,7 @@ ...@@ -1963,6 +1857,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -2040,6 +1935,7 @@ ...@@ -2040,6 +1935,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -2117,6 +2013,7 @@ ...@@ -2117,6 +2013,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
...@@ -2194,6 +2091,7 @@ ...@@ -2194,6 +2091,7 @@
}, },
{ {
"args": [ "args": [
"--webview-apk-path=apks/SystemWebView.apk",
"--test-runner-outdir", "--test-runner-outdir",
".", ".",
"--client-outdir", "--client-outdir",
......
testing/buildbot/test_suites.pyl
View file @ 18ea0a87
...@@ -4818,9 +4818,20 @@ ...@@ -4818,9 +4818,20 @@
} }
}, },
'weblayer_instrumentation_version_tests': { 'weblayer_instrumentation_version_x86_marshmallow_10_tests': {
'weblayer_instrumentation_test_versions_apk': { 'weblayer_instrumentation_test_versions_apk': {
} 'args': [
'--webview-apk-path=apks/AOSP_SystemWebView.apk',
],
},
},
'weblayer_instrumentation_version_x86_pie_oreo_tests': {
'weblayer_instrumentation_test_versions_apk': {
'args': [
'--webview-apk-path=apks/SystemWebView.apk',
],
},
}, },
'weblayer_shell_wpt': { 'weblayer_shell_wpt': {
...@@ -6405,13 +6416,26 @@ ...@@ -6405,13 +6416,26 @@
############################################################################## ##############################################################################
'matrix_compound_suites': { 'matrix_compound_suites': {
'android_weblayer_x86_gtests': { 'android_weblayer_x86_marshmallow_10_gtests': {
'weblayer_instrumentation_version_x86_marshmallow_10_tests': {
'variants': [
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
]
}
},
'android_weblayer_x86_pie_oreo_gtests': {
'weblayer_instrumentation_tests': { 'weblayer_instrumentation_tests': {
'variants': [ 'variants': [
{'identifier': 'ToT_Tests'} {'identifier': 'ToT_Tests'}
] ]
}, },
'weblayer_instrumentation_version_tests': { 'weblayer_instrumentation_version_x86_pie_oreo_tests': {
'variants': [ 'variants': [
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE', 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE', 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
......
testing/buildbot/waterfalls.pyl
View file @ 18ea0a87
...@@ -1186,7 +1186,7 @@ ...@@ -1186,7 +1186,7 @@
], ],
'os_type': 'android', 'os_type': 'android',
'test_suites': { 'test_suites': {
'gtest_tests': 'android_weblayer_x86_gtests', 'gtest_tests': 'android_weblayer_x86_marshmallow_10_gtests',
} }
}, },
'android-weblayer-marshmallow-x86-rel-tests': { 'android-weblayer-marshmallow-x86-rel-tests': {
...@@ -1199,7 +1199,7 @@ ...@@ -1199,7 +1199,7 @@
], ],
'os_type': 'android', 'os_type': 'android',
'test_suites': { 'test_suites': {
'gtest_tests': 'android_weblayer_x86_gtests', 'gtest_tests': 'android_weblayer_x86_marshmallow_10_gtests',
} }
}, },
'android-weblayer-oreo-x86-rel-tests': { 'android-weblayer-oreo-x86-rel-tests': {
...@@ -1212,7 +1212,7 @@ ...@@ -1212,7 +1212,7 @@
], ],
'os_type': 'android', 'os_type': 'android',
'test_suites': { 'test_suites': {
'gtest_tests': 'android_weblayer_x86_gtests', 'gtest_tests': 'android_weblayer_x86_pie_oreo_gtests',
} }
}, },
'android-weblayer-pie-x86-rel-tests': { 'android-weblayer-pie-x86-rel-tests': {
...@@ -1225,7 +1225,7 @@ ...@@ -1225,7 +1225,7 @@
], ],
'os_type': 'android', 'os_type': 'android',
'test_suites': { 'test_suites': {
'gtest_tests': 'android_weblayer_x86_gtests', 'gtest_tests': 'android_weblayer_x86_pie_oreo_gtests',
} }
}, },
}, },
......
weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py
View file @ 18ea0a87
...@@ -140,6 +140,15 @@ def main(): ...@@ -140,6 +140,15 @@ def main():
help=('Test expectations file describing which tests are failing at ' help=('Test expectations file describing which tests are failing at '
'different versions.')) 'different versions.'))
# There are two Webview apks that are available for WebLayer skew tests.
# crbug.com/1163652.
parser.add_argument(
'--webview-apk-path',
required=True,
help=('Relative path for the WebLayer implementation library apk. '
'The path is relative to the WebLayer implementation '
'output directory.'))
version_group = parser.add_mutually_exclusive_group(required=True) version_group = parser.add_mutually_exclusive_group(required=True)
version_group.add_argument( version_group.add_argument(
'--client-version', '--client-version',
...@@ -179,7 +188,7 @@ def main(): ...@@ -179,7 +188,7 @@ def main():
'--apk-under-test', '--apk-under-test',
os.path.join(args.client_outdir, 'apks/WebLayerShellSystemWebView.apk'), os.path.join(args.client_outdir, 'apks/WebLayerShellSystemWebView.apk'),
'--use-webview-provider', '--use-webview-provider',
os.path.join(args.implementation_outdir, 'apks/SystemWebView.apk'), os.path.join(args.implementation_outdir, args.webview_apk_path),
'--additional-apk', '--additional-apk',
os.path.join(args.test_runner_outdir, 'apks/ChromiumNetTestSupport.apk')] os.path.join(args.test_runner_outdir, 'apks/ChromiumNetTestSupport.apk')]
......
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