Skip to content

Commit

Permalink
Revert "[lacros skew tests] Refresh skew tests for M111"
Browse files Browse the repository at this point in the history 
This reverts commit ad191ff.

Reason for revert: Break CI builder.

Original change's description:
> [lacros skew tests] Refresh skew tests for M111
>
> This CL updates the ash version ['111.0.5522.0'] for Lacros version skew testing.
> This cl only affect linux-lacros config builders like linux-lacros-tester-rel,
> linux-lacros-rel.
> This cl will certainly NOT affect Lacros on-device builders(lacros-amd64-generic-rel,
> lacros-amd64-generic-chrome-skylab, etc) or any other platforms.
> If this CL caused regressions, please revert and stop the autoroller
> at https://luci-scheduler.appspot.com/jobs/chrome/lacros-version-skew-roller
> Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org,
> yjt@google.com.
>
> R=​rubber-stamper@appspot.gserviceaccount.com
>
> Bug: None
> Change-Id: I84c27c63724c9e18592a908f6f72666921afd4fe
> Requires-Testing: True
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4140043
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Auto-Submit: chrome-weblayer-builder <chrome-weblayer-builder@chops-service-accounts.iam.gserviceaccount.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/branch-heads/5481@{chromium#149}
> Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}

Bug: None
Change-Id: Ia14ece1706dc872bd5e2052979d0a353dc6ab46f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4144418
Commit-Queue: Sven Zheng <svenzheng@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Sven Zheng <svenzheng@chromium.org>
Cr-Commit-Position: refs/branch-heads/5481@{chromium#152}
Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}
  • Loading branch information
Sven Zheng authored and Chromium LUCI CQ committed Jan 6, 2023
1 parent a6f1124 commit 8ead585
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 68 deletions.
24 changes: 12 additions & 12 deletions testing/buildbot/chromium.chromiumos.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5774,9 +5774,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -5788,8 +5788,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -5945,9 +5945,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -5959,8 +5959,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -6097,9 +6097,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -6111,8 +6111,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down
80 changes: 40 additions & 40 deletions testing/buildbot/chromium.fyi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85336,9 +85336,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -85350,8 +85350,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
Expand Down Expand Up @@ -85477,9 +85477,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -85491,8 +85491,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
Expand Down Expand Up @@ -85604,9 +85604,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -85618,8 +85618,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
Expand Down Expand Up @@ -86952,9 +86952,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -86965,8 +86965,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -87123,9 +87123,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -87136,8 +87136,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -87275,9 +87275,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -87288,8 +87288,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -88813,9 +88813,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -88826,8 +88826,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -88984,9 +88984,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -88997,8 +88997,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -89136,9 +89136,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -89149,8 +89149,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -89922,9 +89922,9 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome"
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
Expand All @@ -89935,8 +89935,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down
24 changes: 12 additions & 12 deletions testing/buildbot/chromium.memory.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18653,12 +18653,12 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome",
"--test-launcher-print-test-stdio=always",
"--combine-ash-logs-on-bots",
"--asan-symbolize-output"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -18670,8 +18670,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -18844,12 +18844,12 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome",
"--test-launcher-print-test-stdio=always",
"--combine-ash-logs-on-bots",
"--asan-symbolize-output"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -18861,8 +18861,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down Expand Up @@ -19011,12 +19011,12 @@
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome",
"--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome",
"--test-launcher-print-test-stdio=always",
"--combine-ash-logs-on-bots",
"--asan-symbolize-output"
],
"description": "Run with ash-chrome version 111.0.5522.0",
"description": "Run with ash-chrome version 111.0.5519.0",
"isolate_profile_data": true,
"merge": {
"args": [],
Expand All @@ -19028,8 +19028,8 @@
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
"location": "lacros_version_skew_tests_v111.0.5522.0",
"revision": "version:111.0.5522.0"
"location": "lacros_version_skew_tests_v111.0.5519.0",
"revision": "version:111.0.5519.0"
}
],
"dimension_sets": [
Expand Down
8 changes: 4 additions & 4 deletions testing/buildbot/variants.pyl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
},
'LACROS_VERSION_SKEW_CANARY': {
'args': [
'--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5522.0/test_ash_chrome',
'--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5519.0/test_ash_chrome',
],
'description': 'Run with ash-chrome version 111.0.5522.0',
'description': 'Run with ash-chrome version 111.0.5519.0',
'identifier': 'Lacros version skew testing ash canary',
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
'location': 'lacros_version_skew_tests_v111.0.5522.0',
'revision': 'version:111.0.5522.0',
'location': 'lacros_version_skew_tests_v111.0.5519.0',
'revision': 'version:111.0.5519.0',
},
],
},
Expand Down

0 comments on commit 8ead585

Please sign in to comment.