Commit 88b177ae authored by Rakib Hasan's avatar Rakib Hasan Committed by Commit Bot

Revert "weblayer, skew tests: Add M88 skew tests"

This reverts commit 902c49d1.

Reason for revert: Builders do not allow using a floating references. We need to start pinning tags to chromium/src again in order to run skew tests. The error can be seen here, https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8863706392115604464/+/steps/test_pre_run/0/steps/s__trigger__weblayer_instrumentation_test_versions_apk_M88_Client_Tests/0/stdout?format=raw

Original change's description:
> weblayer, skew tests: Add M88 skew tests
>
> This skew test will updated daily by uploading new CIPD packages
> for each tag created in the M88 branch. The m88 reference will point
> to the most recent package uploaded.
>
> Bug: 1147459, 1147455, 1099017, 1041619
> Change-Id: Ib9ae51d2a7379d478cbab68a334c7d2488bf0e8a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538152
> Auto-Submit: Rakib Hasan <rmhasan@google.com>
> Commit-Queue: Scott Violet <sky@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#827411}

TBR=sky@chromium.org,rmhasan@google.com

Change-Id: I17d5abc780eeba571c4d92793db46ed88ab61d66
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1147459
Bug: 1147455
Bug: 1099017
Bug: 1041619
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537186Reviewed-by: default avatarRakib Hasan <rmhasan@google.com>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#827479}
parent bb3caac9
......@@ -3555,154 +3555,6 @@
},
"test": "weblayer_instrumentation_test_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--implementation-outdir",
".",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--client-version=88",
"--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_instrumentation_test_versions_apk_M88 Client Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Client Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
".",
"--implementation-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--impl-version=88",
"--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_instrumentation_test_versions_apk_M88 Implementation Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Implementation Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
}
]
},
......@@ -4211,154 +4063,6 @@
},
"test": "weblayer_instrumentation_test_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--implementation-outdir",
".",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--client-version=88",
"--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_instrumentation_test_versions_apk_M88 Client Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Client Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
".",
"--implementation-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--impl-version=88",
"--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_instrumentation_test_versions_apk_M88 Implementation Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Implementation Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
}
]
},
......@@ -4867,154 +4571,6 @@
},
"test": "weblayer_instrumentation_test_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--implementation-outdir",
".",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--client-version=88",
"--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_instrumentation_test_versions_apk_M88 Client Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Client Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_android28",
"path": ".android"
},
{
"name": "system_images_android_28_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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
},
{
"args": [
"--test-runner-outdir",
".",
"--client-outdir",
".",
"--implementation-outdir",
"../../weblayer_instrumentation_test_M88/out/Release",
"--test-expectations",
"../../weblayer/browser/android/javatests/skew/expectations.txt",
"--impl-version=88",
"--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_instrumentation_test_versions_apk_M88 Implementation Tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "weblayer_instrumentation_test_versions_apk_M88 Implementation Tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/weblayer-x86",
"location": "weblayer_instrumentation_test_M88",
"revision": "m88"
},
{
"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_android28",
"path": ".android"
},
{
"name": "system_images_android_28_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_versions_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_versions_apk/"
}
]
}
......
......@@ -5971,11 +5971,9 @@
},
'weblayer_instrumentation_version_tests': {
'variants': [
'WEBLAYER_IMPL_SKEW_TESTS_M88_NIGHTLY',
'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_M88_NIGHTLY',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_ONE_MILESTONE',
'WEBLAYER_CLIENT_SKEW_TESTS_NTH_MINUS_TWO_MILESTONE',
......
......@@ -307,52 +307,6 @@
],
'identifier': 'iPhone X 14.2'
},
'WEBLAYER_IMPL_SKEW_TESTS_M88_NIGHTLY': {
'args': [
'--test-runner-outdir',
'.',
'--client-outdir',
'.',
'--implementation-outdir',
'../../weblayer_instrumentation_test_M88/out/Release',
'--test-expectations',
'../../weblayer/browser/android/javatests/skew/expectations.txt',
'--impl-version=88',
],
'identifier': 'M88 Implementation Tests',
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/testing/weblayer-x86',
'location': 'weblayer_instrumentation_test_M88',
'revision': 'm88',
}
],
},
},
'WEBLAYER_CLIENT_SKEW_TESTS_M88_NIGHTLY': {
'args': [
'--test-runner-outdir',
'.',
'--client-outdir',
'../../weblayer_instrumentation_test_M88/out/Release',
'--implementation-outdir',
'.',
'--test-expectations',
'../../weblayer/browser/android/javatests/skew/expectations.txt',
'--client-version=88',
],
'identifier': 'M88 Client Tests',
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/testing/weblayer-x86',
'location': 'weblayer_instrumentation_test_M88',
'revision': 'm88',
}
],
},
},
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE': {
'args': [
'--test-runner-outdir',
......@@ -491,4 +445,4 @@
],
},
},
}
}
\ No newline at end of file
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