3555c70ecab665fa92702cd31e4580424a5fe4b9 - chromium/src

[rmh...@google.com]

commit 3555c70ecab665fa92702cd31e4580424a5fe4b9
Author: Rakib M. Hasan <rmh...@google.com>
AuthorDate: Wed Mar 02 00:42:12 2022
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Wed Mar 02 00:42:12 2022

WebLayer: Expand milestones skew tested to the last 6 milestones

This CL also temporarily removes the M{N-2} skew tests since the M98
skew test binaries are failing to build.

Bug: 1301835
Change-Id: I99a0a607dc225bd2e6246236836b93647f883403
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3496522
Reviewed-by: Scott Violet <s...@chromium.org>
Commit-Queue: Rakib Hasan <rmh...@google.com>
Cr-Commit-Position: refs/heads/main@{#976486}

diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index a0b27ae..012d9f2f 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -6769,6 +6769,174 @@
"--test-runner-outdir",
".",
"--client-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android30",
+ "path": ".android_emulator/generic_android30"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android30"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android30",
+ "path": ".android_emulator/generic_android30"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android30"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--implementation-outdir",
".",
@@ -7023,6 +7191,174 @@
"--client-outdir",
".",
"--implementation-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android30",
+ "path": ".android_emulator/generic_android30"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android30"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android30",
+ "path": ".android_emulator/generic_android30"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android30"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 4e64afc7..80539ba 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -41788,6 +41788,174 @@
"--test-runner-outdir",
".",
"--client-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android29.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android29",
+ "path": ".android_emulator/generic_android29"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android29"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android29.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android29",
+ "path": ".android_emulator/generic_android29"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android29"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--implementation-outdir",
".",
@@ -42042,6 +42210,174 @@
"--client-outdir",
".",
"--implementation-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android29.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android29",
+ "path": ".android_emulator/generic_android29"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android29"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android29.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android29",
+ "path": ".android_emulator/generic_android29"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android29"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
@@ -42296,6 +42632,174 @@
"--test-runner-outdir",
".",
"--client-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_chrome_with_client_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_chrome_with_client_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android23",
+ "path": ".android_emulator/generic_android23"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android23"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests_with_chrome",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests_with_chrome/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/ChromePublic.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_chrome_with_client_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_chrome_with_client_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android23",
+ "path": ".android_emulator/generic_android23"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android23"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests_with_chrome",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests_with_chrome/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/ChromePublic.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--implementation-outdir",
".",
@@ -42550,6 +43054,174 @@
"--client-outdir",
".",
"--implementation-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_chrome_with_impl_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_chrome_with_impl_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android23",
+ "path": ".android_emulator/generic_android23"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android23"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests_with_chrome",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests_with_chrome/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/ChromePublic.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_chrome_with_impl_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_chrome_with_impl_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android23",
+ "path": ".android_emulator/generic_android23"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android23"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests_with_chrome",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests_with_chrome/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/ChromePublic.apk",
+ "--webview-apk-path=apks/AOSP_SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
@@ -42871,6 +43543,174 @@
"--test-runner-outdir",
".",
"--client-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android27.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android27",
+ "path": ".android_emulator/generic_android27"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android27"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android27.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android27",
+ "path": ".android_emulator/generic_android27"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android27"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--implementation-outdir",
".",
@@ -43125,6 +43965,174 @@
"--client-outdir",
".",
"--implementation-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android27.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android27",
+ "path": ".android_emulator/generic_android27"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android27"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android27.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android27",
+ "path": ".android_emulator/generic_android27"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android27"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
@@ -43446,6 +44454,174 @@
"--test-runner-outdir",
".",
"--client-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android28",
+ "path": ".android_emulator/generic_android28"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android28"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--implementation-outdir",
+ ".",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--client-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_client_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_client_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android28",
+ "path": ".android_emulator/generic_android28"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android28"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--implementation-outdir",
".",
@@ -43700,6 +44876,174 @@
"--client-outdir",
".",
"--implementation-outdir",
+ "../../weblayer_instrumentation_test_M96/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=96",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_96"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_96",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M96",
+ "revision": "version:96.0.4664.141"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android28",
+ "path": ".android_emulator/generic_android28"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android28"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
+ "../../weblayer_instrumentation_test_M97/out/Release",
+ "--test-expectations",
+ "../../weblayer/browser/android/javatests/skew/expectations.txt",
+ "--impl-version=97",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "weblayer_skew_tests_with_impl_from_97"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "weblayer_skew_tests_with_impl_from_97",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "cipd_packages": [
+ {
+ "cipd_package": "chromium/testing/weblayer-x86",
+ "location": "weblayer_instrumentation_test_M97",
+ "revision": "version:97.0.4692.102"
+ },
+ {
+ "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|e2-standard-4",
+ "os": "Ubuntu-16.04|Ubuntu-18.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android28",
+ "path": ".android_emulator/generic_android28"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android28"
+ }
+ ]
+ },
+ "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": "chromiu...@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "weblayer_skew_tests",
+ "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_skew_tests/"
+ },
+ {
+ "args": [
+ "--additional-apk=apks/WebLayerShellSystemWebView.apk",
+ "--webview-apk-path=apks/SystemWebView.apk",
+ "--test-runner-outdir",
+ ".",
+ "--client-outdir",
+ ".",
+ "--implementation-outdir",
"../../weblayer_instrumentation_test_M99/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index fe8b7394..a274b43 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -6608,10 +6608,14 @@
'variants': [
'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
]
}
},
@@ -6621,10 +6625,14 @@
'variants': [
'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
]
}
},
@@ -6639,10 +6647,14 @@
'variants': [
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
- 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE',
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE',
]
}
},
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 180e80e1..ac1329bd 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -416,7 +416,55 @@
],
},
},
- 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE': {
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/AOSP_SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '.',
+ '--implementation-outdir',
+ '../../weblayer_instrumentation_test_M97/out/Release',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--impl-version=97',
+ ],
+ 'identifier': 'with_impl_from_97',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M97',
+ 'revision': 'version:97.0.4692.102',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/AOSP_SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '.',
+ '--implementation-outdir',
+ '../../weblayer_instrumentation_test_M96/out/Release',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--impl-version=96',
+ ],
+ 'identifier': 'with_impl_from_96',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M96',
+ 'revision': 'version:96.0.4664.141',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_10_AND_M_IMPL_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE': {
'args': [
'--webview-apk-path=apks/AOSP_SystemWebView.apk',
'--test-runner-outdir',
@@ -488,7 +536,55 @@
],
},
},
- 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE': {
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '.',
+ '--implementation-outdir',
+ '../../weblayer_instrumentation_test_M97/out/Release',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--impl-version=97',
+ ],
+ 'identifier': 'with_impl_from_97',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M97',
+ 'revision': 'version:97.0.4692.102',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '.',
+ '--implementation-outdir',
+ '../../weblayer_instrumentation_test_M96/out/Release',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--impl-version=96',
+ ],
+ 'identifier': 'with_impl_from_96',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M96',
+ 'revision': 'version:96.0.4664.141',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_IMPL_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE': {
'args': [
'--webview-apk-path=apks/SystemWebView.apk',
'--test-runner-outdir',
@@ -560,7 +656,55 @@
],
},
},
- 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE': {
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_THREE_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '../../weblayer_instrumentation_test_M97/out/Release',
+ '--implementation-outdir',
+ '.',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--client-version=97',
+ ],
+ 'identifier': 'with_client_from_97',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M97',
+ 'revision': 'version:97.0.4692.102',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FOUR_MILESTONE': {
+ 'args': [
+ '--webview-apk-path=apks/SystemWebView.apk',
+ '--test-runner-outdir',
+ '.',
+ '--client-outdir',
+ '../../weblayer_instrumentation_test_M96/out/Release',
+ '--implementation-outdir',
+ '.',
+ '--test-expectations',
+ '../../weblayer/browser/android/javatests/skew/expectations.txt',
+ '--client-version=96',
+ ],
+ 'identifier': 'with_client_from_96',
+ 'swarming': {
+ 'cipd_packages': [
+ {
+ 'cipd_package': 'chromium/testing/weblayer-x86',
+ 'location': 'weblayer_instrumentation_test_M96',
+ 'revision': 'version:96.0.4664.141',
+ }
+ ],
+ },
+ },
+ 'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_FIVE_MILESTONE': {
'args': [
'--webview-apk-path=apks/SystemWebView.apk',
'--test-runner-outdir',
@@ -741,4 +885,4 @@
],
},
},
-}
\ No newline at end of file
+}