ozone/wayland: Replace weston CQ builder with mutter try bot
Add linux-wayland-mutter-rel try builder to CQ with location filters.
Reduce the location filter for the weston try bot to only trigger for
changes in third_party/weston.
Renaming:
- Weston CI thin tester:
Linux Tests (Wayland) -> linux-wayland-weston-rel-tests
- Weston CQ try builder:
linux-wayland-rel -> linux-wayland-weston-rel
- Weston-specific test filters for browser_tests and
interactive_ui_tests to use "weston" instead of "wayland".
R=bpastene,fangzhoug
Fixed: 401284929
Change-Id: Ifb2bd28fdb218c796a713494172a7351e818d0bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6647211
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Orko Garai <orko@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1478134}
diff --git a/infra/config/generated/builder-owners/chrome-linux-engprod@google.com.txt b/infra/config/generated/builder-owners/chrome-linux-engprod@google.com.txt
index 94b0d14f..ac8ae824 100644
--- a/infra/config/generated/builder-owners/chrome-linux-engprod@google.com.txt
+++ b/infra/config/generated/builder-owners/chrome-linux-engprod@google.com.txt
@@ -2,10 +2,11 @@
ci/Linux Builder (Wayland)
ci/Linux Builder (dbg)
ci/Linux Tests
-ci/Linux Tests (Wayland)
ci/Linux Tests (dbg)(1)
ci/Network Service Linux
ci/linux-bfcache-rel
ci/linux-extended-tracing-rel
ci/linux-wayland-mutter-rel-tests
-try/linux-wayland-mutter-rel
\ No newline at end of file
+ci/linux-wayland-weston-rel-tests
+try/linux-wayland-mutter-rel
+try/linux-wayland-weston-rel
\ No newline at end of file
diff --git a/infra/config/generated/builder-owners/~unowned.txt b/infra/config/generated/builder-owners/~unowned.txt
index 05f311e2..24fc309a 100644
--- a/infra/config/generated/builder-owners/~unowned.txt
+++ b/infra/config/generated/builder-owners/~unowned.txt
@@ -226,7 +226,6 @@
try/linux-ubsan-vptr-rel
try/linux-v4l2-codec-rel
try/linux-viz-rel
-try/linux-wayland-rel
try/linux_chromium_archive_rel_ng
try/linux_chromium_asan_rel_ng
try/linux_chromium_asan_rel_ng-compilator
diff --git "a/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/properties.json" "b/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/properties.json"
index aa6253e..08de959 100644
--- "a/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/properties.json"
+++ "b/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/properties.json"
@@ -37,7 +37,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-mutter-rel-tests",
"project": "chromium"
},
"builder_spec": {
@@ -69,7 +69,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "linux-wayland-mutter-rel-tests",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
},
"builder_spec": {
@@ -110,12 +110,12 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-mutter-rel-tests",
"project": "chromium"
},
{
"bucket": "ci",
- "builder": "linux-wayland-mutter-rel-tests",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
}
],
@@ -125,7 +125,7 @@
"group": "tryserver.chromium.linux"
},
{
- "builder": "linux-wayland-rel",
+ "builder": "linux-wayland-weston-rel",
"group": "tryserver.chromium.linux"
}
],
diff --git "a/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/targets/chromium.linux.json" "b/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/targets/chromium.linux.json"
index 81da044..59f52c1 100644
--- "a/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/targets/chromium.linux.json"
+++ "b/infra/config/generated/builders/ci/Linux Builder \050Wayland\051/targets/chromium.linux.json"
@@ -4,7 +4,85 @@
"chrome"
]
},
- "Linux Tests (Wayland)": {
+ "linux-wayland-mutter-rel-tests": {
+ "gtest_tests": [
+ {
+ "args": [
+ "--no-xvfb",
+ "--use-mutter",
+ "--ozone-platform=wayland",
+ "--mutter-display=1280x800",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_mutter.filter"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "browser_tests",
+ "retry_only_failed_tests": true,
+ "swarming": {
+ "dimensions": {
+ "os": "Ubuntu-24.04"
+ },
+ "expiration": 18000,
+ "hard_timeout": 14400,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 10
+ },
+ "test": "browser_tests",
+ "test_id_prefix": "ninja://chrome/test:browser_tests/"
+ },
+ {
+ "args": [
+ "--no-xvfb",
+ "--use-mutter",
+ "--ozone-platform=wayland"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "content_browsertests",
+ "retry_only_failed_tests": true,
+ "swarming": {
+ "dimensions": {
+ "os": "Ubuntu-24.04"
+ },
+ "expiration": 18000,
+ "hard_timeout": 14400,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 10
+ },
+ "test": "content_browsertests",
+ "test_id_prefix": "ninja://content/test:content_browsertests/"
+ },
+ {
+ "args": [
+ "--no-xvfb",
+ "--use-mutter",
+ "--ozone-platform=wayland",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_mutter.filter"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "interactive_ui_tests",
+ "swarming": {
+ "dimensions": {
+ "os": "Ubuntu-24.04"
+ },
+ "expiration": 18000,
+ "hard_timeout": 14400,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 5
+ },
+ "test": "interactive_ui_tests",
+ "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
+ }
+ ]
+ },
+ "linux-wayland-weston-rel-tests": {
"gtest_tests": [
{
"args": [
@@ -258,7 +336,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
@@ -886,7 +964,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
@@ -1690,83 +1768,5 @@
"test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
}
]
- },
- "linux-wayland-mutter-rel-tests": {
- "gtest_tests": [
- {
- "args": [
- "--no-xvfb",
- "--use-mutter",
- "--ozone-platform=wayland",
- "--mutter-display=1280x800",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_mutter.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "browser_tests",
- "retry_only_failed_tests": true,
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-24.04"
- },
- "expiration": 18000,
- "hard_timeout": 14400,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 10
- },
- "test": "browser_tests",
- "test_id_prefix": "ninja://chrome/test:browser_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-mutter",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "content_browsertests",
- "retry_only_failed_tests": true,
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-24.04"
- },
- "expiration": 18000,
- "hard_timeout": 14400,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 10
- },
- "test": "content_browsertests",
- "test_id_prefix": "ninja://content/test:content_browsertests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-mutter",
- "--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_mutter.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "interactive_ui_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-24.04"
- },
- "expiration": 18000,
- "hard_timeout": 14400,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 5
- },
- "test": "interactive_ui_tests",
- "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
- }
- ]
}
}
\ No newline at end of file
diff --git "a/infra/config/generated/builders/ci/Linux Tests \050Wayland\051/targets/chromium.linux.json" "b/infra/config/generated/builders/ci/Linux Tests \050Wayland\051/targets/chromium.linux.json"
deleted file mode 100644
index 3654a0ee1..0000000
--- "a/infra/config/generated/builders/ci/Linux Tests \050Wayland\051/targets/chromium.linux.json"
+++ /dev/null
@@ -1,1689 +0,0 @@
-{
- "Linux Tests (Wayland)": {
- "gtest_tests": [
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "absl_hardening_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "absl_hardening_tests",
- "test_id_prefix": "ninja://third_party/abseil-cpp:absl_hardening_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "accessibility_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "accessibility_unittests",
- "test_id_prefix": "ninja://ui/accessibility:accessibility_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "angle_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "angle_unittests",
- "test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/",
- "use_isolated_scripts_api": true
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "app_shell_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "app_shell_unittests",
- "test_id_prefix": "ninja://extensions/shell:app_shell_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "aura_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "aura_unittests",
- "test_id_prefix": "ninja://ui/aura:aura_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "base_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "base_unittests",
- "test_id_prefix": "ninja://base:base_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "blink_common_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_common_unittests",
- "test_id_prefix": "ninja://third_party/blink/common:blink_common_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "blink_fuzzer_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_fuzzer_unittests",
- "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_fuzzer_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "blink_heap_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_heap_unittests",
- "test_id_prefix": "ninja://third_party/blink/renderer/platform/heap:blink_heap_unittests/"
- },
- {
- "args": [
- "--git-revision=${got_revision}",
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "blink_platform_unittests",
- "precommit_args": [
- "--gerrit-issue=${patch_issue}",
- "--gerrit-patchset=${patch_set}",
- "--buildbucket-id=${buildbucket_build_id}"
- ],
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_platform_unittests",
- "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "boringssl_crypto_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "boringssl_crypto_tests",
- "test_id_prefix": "ninja://third_party/boringssl:boringssl_crypto_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "boringssl_ssl_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "boringssl_ssl_tests",
- "test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "browser_tests",
- "retry_only_failed_tests": true,
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 20
- },
- "test": "browser_tests",
- "test_id_prefix": "ninja://chrome/test:browser_tests/"
- },
- {
- "args": [
- "--gtest_filter=-*UsingRealWebcam*",
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "capture_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "capture_unittests",
- "test_id_prefix": "ninja://media/capture:capture_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "cast_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "cast_unittests",
- "test_id_prefix": "ninja://media/cast:cast_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "cc_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "cc_unittests",
- "test_id_prefix": "ninja://cc:cc_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "chrome_app_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "chrome_app_unittests",
- "test_id_prefix": "ninja://chrome/test:chrome_app_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "chromedriver_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "chromedriver_unittests",
- "test_id_prefix": "ninja://chrome/test/chromedriver:chromedriver_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "components_browsertests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "components_browsertests",
- "test_id_prefix": "ninja://components:components_browsertests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "components_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 3
- },
- "test": "components_unittests",
- "test_id_prefix": "ninja://components:components_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "compositor_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "compositor_unittests",
- "test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "content_browsertests",
- "retry_only_failed_tests": true,
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 8
- },
- "test": "content_browsertests",
- "test_id_prefix": "ninja://content/test:content_browsertests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "content_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "content_unittests",
- "test_id_prefix": "ninja://content/test:content_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "crashpad_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "crashpad_tests",
- "test_id_prefix": "ninja://third_party/crashpad/crashpad:crashpad_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "cronet_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "cronet_tests",
- "test_id_prefix": "ninja://components/cronet:cronet_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "cronet_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "cronet_unittests",
- "test_id_prefix": "ninja://components/cronet:cronet_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "crypto_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "crypto_unittests",
- "test_id_prefix": "ninja://crypto:crypto_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "dbus_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "dbus_unittests",
- "test_id_prefix": "ninja://dbus:dbus_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "device_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "device_unittests",
- "test_id_prefix": "ninja://device:device_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "display_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "display_unittests",
- "test_id_prefix": "ninja://ui/display:display_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "ci_only": true,
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "env_chromium_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "env_chromium_unittests",
- "test_id_prefix": "ninja://third_party/leveldatabase:env_chromium_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "events_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "events_unittests",
- "test_id_prefix": "ninja://ui/events:events_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "extensions_browsertests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "extensions_browsertests",
- "test_id_prefix": "ninja://extensions:extensions_browsertests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "extensions_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "extensions_unittests",
- "test_id_prefix": "ninja://extensions:extensions_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "filesystem_service_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "filesystem_service_unittests",
- "test_id_prefix": "ninja://components/services/filesystem:filesystem_service_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "fuzzing_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "fuzzing_unittests",
- "test_id_prefix": "ninja://testing/libfuzzer/tests:fuzzing_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "gcm_unit_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "gcm_unit_tests",
- "test_id_prefix": "ninja://google_apis/gcm:gcm_unit_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "gfx_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "gfx_unittests",
- "test_id_prefix": "ninja://ui/gfx:gfx_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "gin_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "gin_unittests",
- "test_id_prefix": "ninja://gin:gin_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "google_apis_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "google_apis_unittests",
- "test_id_prefix": "ninja://google_apis:google_apis_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "gpu_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "gpu_unittests",
- "test_id_prefix": "ninja://gpu:gpu_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "gwp_asan_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "gwp_asan_unittests",
- "test_id_prefix": "ninja://components/gwp_asan:gwp_asan_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "headless_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "headless_unittests",
- "test_id_prefix": "ninja://headless:headless_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "interactive_ui_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 3
- },
- "test": "interactive_ui_tests",
- "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "ipc_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "ipc_tests",
- "test_id_prefix": "ninja://ipc:ipc_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "latency_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "latency_unittests",
- "test_id_prefix": "ninja://ui/latency:latency_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "ci_only": true,
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "leveldb_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "leveldb_unittests",
- "test_id_prefix": "ninja://third_party/leveldatabase:leveldb_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "libjingle_xmpp_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "libjingle_xmpp_unittests",
- "test_id_prefix": "ninja://third_party/libjingle_xmpp:libjingle_xmpp_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "liburlpattern_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "liburlpattern_unittests",
- "test_id_prefix": "ninja://third_party/liburlpattern:liburlpattern_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "media_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "media_unittests",
- "test_id_prefix": "ninja://media:media_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "message_center_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "message_center_unittests",
- "test_id_prefix": "ninja://ui/message_center:message_center_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "midi_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "midi_unittests",
- "test_id_prefix": "ninja://media/midi:midi_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "mojo_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "mojo_unittests",
- "test_id_prefix": "ninja://mojo:mojo_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "native_theme_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "native_theme_unittests",
- "test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "net_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "net_unittests",
- "test_id_prefix": "ninja://net:net_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "openscreen_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "openscreen_unittests",
- "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "ozone_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "ozone_unittests",
- "test_id_prefix": "ninja://ui/ozone:ozone_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "pdf_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "pdf_unittests",
- "test_id_prefix": "ninja://pdf:pdf_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "perfetto_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "perfetto_unittests",
- "test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "printing_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "printing_unittests",
- "test_id_prefix": "ninja://printing:printing_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "ci_only": true,
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "pthreadpool_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "pthreadpool_unittests",
- "test_id_prefix": "ninja://third_party/pthreadpool:pthreadpool_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "remoting_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "remoting_unittests",
- "test_id_prefix": "ninja://remoting:remoting_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "sandbox_linux_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "sandbox_linux_unittests",
- "test_id_prefix": "ninja://sandbox/linux:sandbox_linux_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "services_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "services_unittests",
- "test_id_prefix": "ninja://services:services_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "shell_dialogs_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "shell_dialogs_unittests",
- "test_id_prefix": "ninja://ui/shell_dialogs:shell_dialogs_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "skia_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "skia_unittests",
- "test_id_prefix": "ninja://skia:skia_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "snapshot_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "snapshot_unittests",
- "test_id_prefix": "ninja://ui/snapshot:snapshot_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "sql_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "sql_unittests",
- "test_id_prefix": "ninja://sql:sql_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "storage_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "storage_unittests",
- "test_id_prefix": "ninja://storage:storage_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "sync_integration_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 3
- },
- "test": "sync_integration_tests",
- "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "ui_base_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "ui_base_unittests",
- "test_id_prefix": "ninja://ui/base:ui_base_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "ui_touch_selection_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "ui_touch_selection_unittests",
- "test_id_prefix": "ninja://ui/touch_selection:ui_touch_selection_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "ui_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "ui_unittests",
- "test_id_prefix": "ninja://ui/tests:ui_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.unit_tests_wayland.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "unit_tests",
- "retry_only_failed_tests": true,
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "unit_tests",
- "test_id_prefix": "ninja://chrome/test:unit_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "url_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "url_unittests",
- "test_id_prefix": "ninja://url:url_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "views_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "views_unittests",
- "test_id_prefix": "ninja://ui/views:views_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "viz_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "viz_unittests",
- "test_id_prefix": "ninja://components/viz:viz_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "vr_common_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "vr_common_unittests",
- "test_id_prefix": "ninja://chrome/browser/vr:vr_common_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "webkit_unit_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_unittests",
- "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "wm_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "wm_unittests",
- "test_id_prefix": "ninja://ui/wm:wm_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "wtf_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "wtf_unittests",
- "test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "xr_browser_tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "xr_browser_tests",
- "test_id_prefix": "ninja://chrome/test:xr_browser_tests/"
- },
- {
- "args": [
- "--no-xvfb",
- "--use-weston",
- "--ozone-platform=wayland"
- ],
- "isolate_profile_data": true,
- "merge": {
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "zlib_unittests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "zlib_unittests",
- "test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
- }
- ]
- }
-}
\ No newline at end of file
diff --git "a/infra/config/generated/builders/ci/Linux Tests \050Wayland\051/properties.json" b/infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/properties.json
similarity index 92%
rename from "infra/config/generated/builders/ci/Linux Tests \050Wayland\051/properties.json"
rename to infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/properties.json
index c667fab..12018ac 100644
--- "a/infra/config/generated/builders/ci/Linux Tests \050Wayland\051/properties.json"
+++ b/infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/properties.json
@@ -34,7 +34,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
},
"builder_spec": {
@@ -68,18 +68,18 @@
"builder_ids": [
{
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
}
],
"mirroring_builder_group_and_names": [
{
- "builder": "linux-wayland-rel",
+ "builder": "linux-wayland-weston-rel",
"group": "tryserver.chromium.linux"
}
],
"retry_failed_shards": true,
- "targets_spec_directory": "src/infra/config/generated/builders/ci/Linux Tests (Wayland)/targets"
+ "targets_spec_directory": "src/infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/targets"
}
},
"$recipe_engine/resultdb/test_presentation": {
diff --git a/infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json b/infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/targets/chromium.linux.json
similarity index 99%
rename from infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json
rename to infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/targets/chromium.linux.json
index fd56c0a1..46b8676 100644
--- a/infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json
+++ b/infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/targets/chromium.linux.json
@@ -1,10 +1,5 @@
{
- "Linux Builder (Wayland)": {
- "additional_compile_targets": [
- "chrome"
- ]
- },
- "Linux Tests (Wayland)": {
+ "linux-wayland-weston-rel-tests": {
"gtest_tests": [
{
"args": [
@@ -258,7 +253,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
@@ -886,7 +881,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
diff --git a/infra/config/generated/builders/gn_args_locations.json b/infra/config/generated/builders/gn_args_locations.json
index 5a4973a..3ae7e494 100644
--- a/infra/config/generated/builders/gn_args_locations.json
+++ b/infra/config/generated/builders/gn_args_locations.json
@@ -804,7 +804,7 @@
"linux-v4l2-codec-rel": "try/linux-v4l2-codec-rel/gn-args.json",
"linux-viz-rel": "try/linux-viz-rel/gn-args.json",
"linux-wayland-mutter-rel": "try/linux-wayland-mutter-rel/gn-args.json",
- "linux-wayland-rel": "try/linux-wayland-rel/gn-args.json",
+ "linux-wayland-weston-rel": "try/linux-wayland-weston-rel/gn-args.json",
"linux_chromium_archive_rel_ng": "try/linux_chromium_archive_rel_ng/gn-args.json",
"linux_chromium_asan_rel_ng": "try/linux_chromium_asan_rel_ng/gn-args.json",
"linux_chromium_cfi_rel_ng": "try/linux_chromium_cfi_rel_ng/gn-args.json",
diff --git a/infra/config/generated/builders/try/linux-wayland-mutter-rel/properties.json b/infra/config/generated/builders/try/linux-wayland-mutter-rel/properties.json
index 7cd1b249c..19598b7e 100644
--- a/infra/config/generated/builders/try/linux-wayland-mutter-rel/properties.json
+++ b/infra/config/generated/builders/try/linux-wayland-mutter-rel/properties.json
@@ -113,5 +113,6 @@
]
},
"builder_group": "tryserver.chromium.linux",
+ "cq": "path-based",
"recipe": "chromium_trybot"
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/linux-wayland-rel/gn-args.json b/infra/config/generated/builders/try/linux-wayland-weston-rel/gn-args.json
similarity index 100%
rename from infra/config/generated/builders/try/linux-wayland-rel/gn-args.json
rename to infra/config/generated/builders/try/linux-wayland-weston-rel/gn-args.json
diff --git a/infra/config/generated/builders/try/linux-wayland-rel/properties.json b/infra/config/generated/builders/try/linux-wayland-weston-rel/properties.json
similarity index 92%
rename from infra/config/generated/builders/try/linux-wayland-rel/properties.json
rename to infra/config/generated/builders/try/linux-wayland-weston-rel/properties.json
index 1b89c3eb..97b1c20 100644
--- a/infra/config/generated/builders/try/linux-wayland-rel/properties.json
+++ b/infra/config/generated/builders/try/linux-wayland-weston-rel/properties.json
@@ -2,7 +2,7 @@
"$build/chromium_tests_builder_config": {
"builder_config": {
"additional_exclusions": [
- "infra/config/generated/builders/try/linux-wayland-rel/gn-args.json"
+ "infra/config/generated/builders/try/linux-wayland-weston-rel/gn-args.json"
],
"builder_db": {
"entries": [
@@ -37,7 +37,7 @@
{
"builder_id": {
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
},
"builder_spec": {
@@ -78,11 +78,11 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
- "builder": "Linux Tests (Wayland)",
+ "builder": "linux-wayland-weston-rel-tests",
"project": "chromium"
}
],
- "targets_spec_directory": "src/infra/config/generated/builders/try/linux-wayland-rel/targets"
+ "targets_spec_directory": "src/infra/config/generated/builders/try/linux-wayland-weston-rel/targets"
}
},
"$build/code_coverage": {
diff --git a/infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json b/infra/config/generated/builders/try/linux-wayland-weston-rel/targets/chromium.linux.json
similarity index 99%
copy from infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json
copy to infra/config/generated/builders/try/linux-wayland-weston-rel/targets/chromium.linux.json
index fd56c0a1..f6ce5216 100644
--- a/infra/config/generated/builders/try/linux-wayland-rel/targets/chromium.linux.json
+++ b/infra/config/generated/builders/try/linux-wayland-weston-rel/targets/chromium.linux.json
@@ -4,7 +4,7 @@
"chrome"
]
},
- "Linux Tests (Wayland)": {
+ "linux-wayland-weston-rel-tests": {
"gtest_tests": [
{
"args": [
@@ -258,7 +258,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
@@ -886,7 +886,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter"
],
"isolate_profile_data": true,
"merge": {
diff --git a/infra/config/generated/cq-builders.md b/infra/config/generated/cq-builders.md
index 12aecf6..498dbdf0 100644
--- a/infra/config/generated/cq-builders.md
+++ b/infra/config/generated/cq-builders.md
@@ -595,19 +595,29 @@
* [`//media/gpu/chromeos/.+`](https://cs.chromium.org/chromium/src/media/gpu/chromeos/)
* [`//media/gpu/v4l2/.+`](https://cs.chromium.org/chromium/src/media/gpu/v4l2/)
-* [linux-wayland-rel](https://ci.chromium.org/p/chromium/builders/try/linux-wayland-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""linux-wayland-rel""))
+* [linux-wayland-mutter-rel](https://ci.chromium.org/p/chromium/builders/try/linux-wayland-mutter-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""linux-wayland-mutter-rel""))
Location filters:
* [`//chrome/browser/.+(ui|browser)test.+`](https://cs.chromium.org/search?q=+file:chrome/browser/.+(ui|browser)test)
* [`//chrome/browser/ui/views/.+test.+`](https://cs.chromium.org/search?q=+file:chrome/browser/ui/views/.+test)
* [`//chrome/browser/ui/views/tabs/.+`](https://cs.chromium.org/chromium/src/chrome/browser/ui/views/tabs/)
* [`//testing/xvfb\.py`](https://cs.chromium.org/search?q=+file:testing/xvfb\.py)
+ * [`//third_party/glib/.+`](https://cs.chromium.org/chromium/src/third_party/glib/)
+ * [`//third_party/gvdb/.+`](https://cs.chromium.org/chromium/src/third_party/gvdb/)
+ * [`//third_party/libdisplay-info/.+`](https://cs.chromium.org/chromium/src/third_party/libdisplay-info/)
+ * [`//third_party/libgudev/.+`](https://cs.chromium.org/chromium/src/third_party/libgudev/)
+ * [`//third_party/libinput/.+`](https://cs.chromium.org/chromium/src/third_party/libinput/)
+ * [`//third_party/mutter/.+`](https://cs.chromium.org/chromium/src/third_party/mutter/)
* [`//third_party/wayland/.+`](https://cs.chromium.org/chromium/src/third_party/wayland/)
* [`//third_party/wayland-protocols/.+`](https://cs.chromium.org/chromium/src/third_party/wayland-protocols/)
- * [`//third_party/weston/.+`](https://cs.chromium.org/chromium/src/third_party/weston/)
* [`//ui/ozone/platform/wayland/.+`](https://cs.chromium.org/chromium/src/ui/ozone/platform/wayland/)
* [`//ui/views/widget/.+test.+`](https://cs.chromium.org/search?q=+file:ui/views/widget/.+test)
+* [linux-wayland-weston-rel](https://ci.chromium.org/p/chromium/builders/try/linux-wayland-weston-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""linux-wayland-weston-rel""))
+
+ Location filters:
+ * [`//third_party/weston/.+`](https://cs.chromium.org/chromium/src/third_party/weston/)
+
* [linux_chromium_cfi_rel_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_cfi_rel_ng) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""linux_chromium_cfi_rel_ng""))
Location filters:
diff --git a/infra/config/generated/cq-usage/full.cfg b/infra/config/generated/cq-usage/full.cfg
index 52fd175c..4fee455 100644
--- a/infra/config/generated/cq-usage/full.cfg
+++ b/infra/config/generated/cq-usage/full.cfg
@@ -3318,7 +3318,7 @@
}
}
builders {
- name: "chromium/try/linux-wayland-rel"
+ name: "chromium/try/linux-wayland-mutter-rel"
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
@@ -3347,6 +3347,42 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/glib/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/gvdb/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libdisplay-info/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libgudev/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libinput/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/mutter/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
path_regexp: "third_party/wayland/.+"
}
location_filters {
@@ -3359,12 +3395,6 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
- path_regexp: "third_party/weston/.+"
- }
- location_filters {
- gerrit_host_regexp: ".*"
- gerrit_project_regexp: ".*"
- gerrit_ref_regexp: ".*"
path_regexp: "ui/ozone/platform/wayland/.+"
}
location_filters {
@@ -3391,7 +3421,36 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
- path_regexp: "infra/config/generated/builders/try/linux-wayland-rel/.+"
+ path_regexp: "infra/config/generated/builders/try/linux-wayland-mutter-rel/.+"
+ }
+ }
+ builders {
+ name: "chromium/try/linux-wayland-weston-rel"
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/weston/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "infra/config/.+"
+ exclude: true
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "docs/.+"
+ exclude: true
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "infra/config/generated/builders/try/linux-wayland-weston-rel/.+"
}
}
builders {
diff --git a/infra/config/generated/cq-usage/mega_cq_bots.txt b/infra/config/generated/cq-usage/mega_cq_bots.txt
index c91f2e4e..ab9278c 100644
--- a/infra/config/generated/cq-usage/mega_cq_bots.txt
+++ b/infra/config/generated/cq-usage/mega_cq_bots.txt
@@ -119,7 +119,7 @@
chromium/try/linux-ubsan-vptr-rel
chromium/try/linux-v4l2-codec-rel
chromium/try/linux-wayland-mutter-rel
-chromium/try/linux-wayland-rel
+chromium/try/linux-wayland-weston-rel
chromium/try/linux-win-cross-rel
chromium/try/linux_chromium_archive_rel_ng
chromium/try/linux_chromium_asan_rel_ng
diff --git a/infra/config/generated/health-specs/health-specs.json b/infra/config/generated/health-specs/health-specs.json
index 112abf9f..a522c158 100644
--- a/infra/config/generated/health-specs/health-specs.json
+++ b/infra/config/generated/health-specs/health-specs.json
@@ -3482,27 +3482,6 @@
}
]
},
- "Linux Tests (Wayland)": {
- "contact_team_email": "chrome-linux-engprod@google.com",
- "problem_specs": [
- {
- "name": "Unhealthy",
- "period_days": 7,
- "score": 5,
- "thresholds": {
- "_default": "_default"
- }
- },
- {
- "name": "Low Value",
- "period_days": 90,
- "score": 1,
- "thresholds": {
- "_default": "_default"
- }
- }
- ]
- },
"Linux Tests (dbg)(1)": {
"contact_team_email": "chrome-linux-engprod@google.com",
"problem_specs": [
@@ -10464,6 +10443,27 @@
}
]
},
+ "linux-wayland-weston-rel-tests": {
+ "contact_team_email": "chrome-linux-engprod@google.com",
+ "problem_specs": [
+ {
+ "name": "Unhealthy",
+ "period_days": 7,
+ "score": 5,
+ "thresholds": {
+ "_default": "_default"
+ }
+ },
+ {
+ "name": "Low Value",
+ "period_days": 90,
+ "score": 1,
+ "thresholds": {
+ "_default": "_default"
+ }
+ }
+ ]
+ },
"linux-win-cross-clang-tot-rel": {
"contact_team_email": "lexan@google.com",
"problem_specs": [
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index 410dc63..a2f9aee 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -5555,11 +5555,6 @@
}
builders {
name: "chromium/try/linux-wayland-mutter-rel"
- includable_only: true
- disable_reuse_footers: "Include-Ci-Only-Tests"
- }
- builders {
- name: "chromium/try/linux-wayland-rel"
disable_reuse_footers: "Include-Ci-Only-Tests"
location_filters {
gerrit_host_regexp: ".*"
@@ -5589,6 +5584,42 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/glib/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/gvdb/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libdisplay-info/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libgudev/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/libinput/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/mutter/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
path_regexp: "third_party/wayland/.+"
}
location_filters {
@@ -5601,12 +5632,6 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
- path_regexp: "third_party/weston/.+"
- }
- location_filters {
- gerrit_host_regexp: ".*"
- gerrit_project_regexp: ".*"
- gerrit_ref_regexp: ".*"
path_regexp: "ui/ozone/platform/wayland/.+"
}
location_filters {
@@ -5633,7 +5658,39 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
- path_regexp: "infra/config/generated/builders/try/linux-wayland-rel/.+"
+ path_regexp: "infra/config/generated/builders/try/linux-wayland-mutter-rel/.+"
+ }
+ mode_allowlist: "DRY_RUN"
+ mode_allowlist: "FULL_RUN"
+ }
+ builders {
+ name: "chromium/try/linux-wayland-weston-rel"
+ disable_reuse_footers: "Include-Ci-Only-Tests"
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "third_party/weston/.+"
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "infra/config/.+"
+ exclude: true
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "docs/.+"
+ exclude: true
+ }
+ location_filters {
+ gerrit_host_regexp: ".*"
+ gerrit_project_regexp: ".*"
+ gerrit_ref_regexp: ".*"
+ path_regexp: "infra/config/generated/builders/try/linux-wayland-weston-rel/.+"
}
mode_allowlist: "DRY_RUN"
mode_allowlist: "FULL_RUN"
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 0a93545..c2bc9393 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -17971,7 +17971,7 @@
use_invocation_timestamp: true
}
}
- description_html: "This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-mutter-rel\">linux-wayland-mutter-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-rel\">linux-wayland-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-linux-engprod@google.com>chrome-linux-engprod@google.com</a>"
+ description_html: "This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-mutter-rel\">linux-wayland-mutter-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-weston-rel\">linux-wayland-weston-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-linux-engprod@google.com>chrome-linux-engprod@google.com</a>"
shadow_builder_adjustments {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
pool: "luci.chromium.try"
@@ -20563,122 +20563,6 @@
}
}
builders {
- name: "Linux Tests (Wayland)"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "free_space:standard"
- dimensions: "os:Ubuntu-22.04"
- dimensions: "pool:luci.chromium.ci"
- dimensions: "ssd:0"
- exe {
- cipd_package: "infra/chromium/bootstrapper/${platform}"
- cipd_version: "latest"
- cmd: "bootstrapper"
- }
- properties:
- '{'
- ' "$bootstrap/exe": {'
- ' "exe": {'
- ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
- ' "cipd_version": "refs/heads/main",'
- ' "cmd": ['
- ' "luciexe"'
- ' ]'
- ' }'
- ' },'
- ' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/Linux Tests (Wayland)/properties.json",'
- ' "top_level_project": {'
- ' "ref": "refs/heads/main",'
- ' "repo": {'
- ' "host": "chromium.googlesource.com",'
- ' "project": "chromium/src"'
- ' }'
- ' }'
- ' },'
- ' "builder_group": "chromium.linux",'
- ' "gardener_rotations": ['
- ' "chromium"'
- ' ],'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "chromium",'
- ' "sheriff_rotations": ['
- ' "chromium"'
- ' ]'
- '}'
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "chromium.use_per_builder_build_dir_name"
- value: 100
- }
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- resultdb {
- enable: true
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "ci_test_results"
- test_results {}
- }
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "gpu_ci_test_results"
- test_results {
- predicate {
- test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
- }
- }
- }
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "blink_web_tests_ci_test_results"
- test_results {
- predicate {
- test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
- }
- }
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- description_html: "This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-rel\">linux-wayland-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-linux-engprod@google.com>chrome-linux-engprod@google.com</a>"
- shadow_builder_adjustments {
- service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- pool: "luci.chromium.try"
- dimensions: "free_space:"
- dimensions: "pool:luci.chromium.try"
- }
- contact_team_email: "chrome-linux-engprod@google.com"
- custom_metric_definitions {
- name: "/chrome/infra/browser/builds/cached_count"
- predicates: "has(build.output.properties.is_cached)"
- predicates: "string(build.output.properties.is_cached) == \"true\""
- }
- custom_metric_definitions {
- name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
- predicates: "has(build.output.properties.ran_tests_retry_shard)"
- }
- custom_metric_definitions {
- name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
- predicates: "has(build.output.properties.ran_tests_without_patch)"
- }
- custom_metric_definitions {
- name: "/chrome/infra/browser/builds/uncached_count"
- predicates: "has(build.output.properties.is_cached)"
- predicates: "string(build.output.properties.is_cached) == \"false\""
- }
- }
- builders {
name: "Linux Tests (dbg)(1)"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
@@ -58559,6 +58443,122 @@
}
}
builders {
+ name: "linux-wayland-weston-rel-tests"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
+ dimensions: "os:Ubuntu-22.04"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/chromium/bootstrapper/${platform}"
+ cipd_version: "latest"
+ cmd: "bootstrapper"
+ }
+ properties:
+ '{'
+ ' "$bootstrap/exe": {'
+ ' "exe": {'
+ ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+ ' "cipd_version": "refs/heads/main",'
+ ' "cmd": ['
+ ' "luciexe"'
+ ' ]'
+ ' }'
+ ' },'
+ ' "$bootstrap/properties": {'
+ ' "properties_file": "infra/config/generated/builders/ci/linux-wayland-weston-rel-tests/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "chromium.linux",'
+ ' "gardener_rotations": ['
+ ' "chromium"'
+ ' ],'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium",'
+ ' "sheriff_rotations": ['
+ ' "chromium"'
+ ' ]'
+ '}'
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.use_per_builder_build_dir_name"
+ value: 100
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+ }
+ }
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "blink_web_tests_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ description_html: "Runs Wayland tests on Weston. See the <a href=\"https://chromium.googlesource.com/chromium/src/+/main/docs/ozone_overview.md#wayland\">ozone wayland doc</a> for details.<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-wayland-weston-rel\">linux-wayland-weston-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-linux-engprod@google.com>chrome-linux-engprod@google.com</a>"
+ shadow_builder_adjustments {
+ service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+ pool: "luci.chromium.try"
+ dimensions: "free_space:"
+ dimensions: "pool:luci.chromium.try"
+ }
+ contact_team_email: "chrome-linux-engprod@google.com"
+ custom_metric_definitions {
+ name: "/chrome/infra/browser/builds/cached_count"
+ predicates: "has(build.output.properties.is_cached)"
+ predicates: "string(build.output.properties.is_cached) == \"true\""
+ }
+ custom_metric_definitions {
+ name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+ predicates: "has(build.output.properties.ran_tests_retry_shard)"
+ }
+ custom_metric_definitions {
+ name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+ predicates: "has(build.output.properties.ran_tests_without_patch)"
+ }
+ custom_metric_definitions {
+ name: "/chrome/infra/browser/builds/uncached_count"
+ predicates: "has(build.output.properties.is_cached)"
+ predicates: "string(build.output.properties.is_cached) == \"false\""
+ }
+ }
+ builders {
name: "linux-win-cross-clang-tot-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
@@ -110837,6 +110837,7 @@
' }'
' },'
' "builder_group": "tryserver.chromium.linux",'
+ ' "cq": "path-based",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium_trybot"'
'}'
@@ -110913,7 +110914,7 @@
}
}
builders {
- name: "linux-wayland-rel"
+ name: "linux-wayland-weston-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
@@ -110939,7 +110940,7 @@
' }'
' },'
' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/try/linux-wayland-rel/properties.json",'
+ ' "properties_file": "infra/config/generated/builders/try/linux-wayland-weston-rel/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
@@ -111004,7 +111005,8 @@
use_invocation_timestamp: true
}
}
- description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Linux Builder (Wayland)\">Linux Builder (Wayland)</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Linux Tests (Wayland)\">Linux Tests (Wayland)</a></li></ul>"
+ description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Linux Builder (Wayland)\">Linux Builder (Wayland)</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/linux-wayland-weston-rel-tests\">linux-wayland-weston-rel-tests</a></li></ul><br/>Builder owner: <a href=mailto:chrome-linux-engprod@google.com>chrome-linux-engprod@google.com</a>"
+ contact_team_email: "chrome-linux-engprod@google.com"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"
predicates: "has(build.output.properties.is_cached)"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index be82311..36c9d45 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -787,7 +787,7 @@
short_name: "tst-mt"
}
builders {
- name: "buildbucket/luci.chromium.ci/Linux Tests (Wayland)"
+ name: "buildbucket/luci.chromium.ci/linux-wayland-weston-rel-tests"
category: "chromium.linux|release"
short_name: "tst-wl"
}
@@ -1493,7 +1493,7 @@
short_name: "tst-mt"
}
builders {
- name: "buildbucket/luci.chromium.ci/Linux Tests (Wayland)"
+ name: "buildbucket/luci.chromium.ci/linux-wayland-weston-rel-tests"
category: "chromium.linux|release"
short_name: "tst-wl"
}
@@ -6869,7 +6869,7 @@
short_name: "tst-mt"
}
builders {
- name: "buildbucket/luci.chromium.ci/Linux Tests (Wayland)"
+ name: "buildbucket/luci.chromium.ci/linux-wayland-weston-rel-tests"
category: "chromium.linux|release"
short_name: "tst-wl"
}
@@ -7696,7 +7696,7 @@
short_name: "tst-mt"
}
builders {
- name: "buildbucket/luci.chromium.ci/Linux Tests (Wayland)"
+ name: "buildbucket/luci.chromium.ci/linux-wayland-weston-rel-tests"
category: "chromium.linux|release"
short_name: "tst-wl"
}
@@ -18808,7 +18808,7 @@
short_name: "tst-mt"
}
builders {
- name: "buildbucket/luci.chromium.ci/Linux Tests (Wayland)"
+ name: "buildbucket/luci.chromium.ci/linux-wayland-weston-rel-tests"
category: "release"
short_name: "tst-wl"
}
@@ -27173,7 +27173,7 @@
name: "buildbucket/luci.chromium.try/linux-wayland-mutter-rel"
}
builders {
- name: "buildbucket/luci.chromium.try/linux-wayland-rel"
+ name: "buildbucket/luci.chromium.try/linux-wayland-weston-rel"
}
builders {
name: "buildbucket/luci.chromium.try/linux-win-cross-rel"
@@ -28625,7 +28625,7 @@
name: "buildbucket/luci.chromium.try/linux-wayland-mutter-rel"
}
builders {
- name: "buildbucket/luci.chromium.try/linux-wayland-rel"
+ name: "buildbucket/luci.chromium.try/linux-wayland-weston-rel"
}
builders {
name: "buildbucket/luci.chromium.try/linux_chromium_archive_rel_ng"
diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg
index 391fa86..f72ec8cbf 100644
--- a/infra/config/generated/luci/luci-notify.cfg
+++ b/infra/config/generated/luci/luci-notify.cfg
@@ -1126,31 +1126,6 @@
}
builders {
bucket: "ci"
- name: "Linux Tests (Wayland)"
- }
- tree_closers {
- tree_status_host: "chromium-status.appspot.com"
- failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
- }
-}
-notifiers {
- notifications {
- on_occurrence: FAILURE
- failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
- email {
- rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
- }
- template: "tree_closure_email_template"
- }
- notifications {
- on_occurrence: FAILURE
- failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
- email {
- recipients: "thomasanderson@chromium.org"
- }
- }
- builders {
- bucket: "ci"
name: "Linux Tests (dbg)(1)"
}
tree_closers {
@@ -3763,6 +3738,31 @@
}
notifiers {
notifications {
+ on_occurrence: FAILURE
+ failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
+ email {
+ rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+ }
+ template: "tree_closure_email_template"
+ }
+ notifications {
+ on_occurrence: FAILURE
+ failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
+ email {
+ recipients: "thomasanderson@chromium.org"
+ }
+ }
+ builders {
+ bucket: "ci"
+ name: "linux-wayland-weston-rel-tests"
+ }
+ tree_closers {
+ tree_status_host: "chromium-status.appspot.com"
+ failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
+ }
+}
+notifiers {
+ notifications {
on_change: true
email {
recipients: "chrome-fuzzing-core+bots@google.com"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index 27a4ba97..066938a 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -1571,15 +1571,6 @@
}
}
job {
- id: "Linux Tests (Wayland)"
- realm: "ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "Linux Tests (Wayland)"
- }
-}
-job {
id: "Linux Tests (dbg)(1)"
realm: "ci"
buildbucket {
@@ -4975,6 +4966,15 @@
}
}
job {
+ id: "linux-wayland-weston-rel-tests"
+ realm: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "linux-wayland-weston-rel-tests"
+ }
+}
+job {
id: "linux-win-cross-clang-tot-rel"
realm: "ci"
buildbucket {
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg
index d7139bc..1ac5810 100644
--- a/infra/config/generated/luci/realms.cfg
+++ b/infra/config/generated/luci/realms.cfg
@@ -220,7 +220,6 @@
values: "Linux Release (NVIDIA)"
values: "Linux TSan Tests"
values: "Linux Tests"
- values: "Linux Tests (Wayland)"
values: "Linux Tests (dbg)(1)"
values: "Linux UBSan Tests"
values: "Mac ASan 64 Tests (1)"
@@ -267,6 +266,7 @@
values: "linux-updater-tester-dbg"
values: "linux-updater-tester-rel"
values: "linux-wayland-mutter-rel-tests"
+ values: "linux-wayland-weston-rel-tests"
values: "mac-fieldtrial-tester"
values: "mac-skia-alt-arm64-rel-tests"
values: "mac11-arm64-rel-tests"
diff --git a/infra/config/generated/sheriff-rotations/chromium.txt b/infra/config/generated/sheriff-rotations/chromium.txt
index fd743640..0a10d58 100644
--- a/infra/config/generated/sheriff-rotations/chromium.txt
+++ b/infra/config/generated/sheriff-rotations/chromium.txt
@@ -38,7 +38,6 @@
ci/Linux TSan Builder
ci/Linux TSan Tests
ci/Linux Tests
-ci/Linux Tests (Wayland)
ci/Linux Tests (dbg)(1)
ci/Linux UBSan Builder
ci/Linux UBSan Tests
@@ -107,6 +106,7 @@
ci/linux-presubmit
ci/linux-v4l2-codec-rel
ci/linux-wayland-mutter-rel-tests
+ci/linux-wayland-weston-rel-tests
ci/linux-win-cross-rel
ci/mac-archive-rel
ci/mac-arm64-archive-rel
diff --git a/infra/config/lib/builder_exemptions.star b/infra/config/lib/builder_exemptions.star
index 053b184..7d549b9 100644
--- a/infra/config/lib/builder_exemptions.star
+++ b/infra/config/lib/builder_exemptions.star
@@ -80,7 +80,6 @@
"Linux MSan Tests",
"Linux TSan Builder",
"Linux TSan Tests",
- "Linux Tests (Wayland)",
"Linux Tests (dbg)(1)",
"Linux Tests",
"Linux Viz",
diff --git a/infra/config/subprojects/chromium/ci/chromium.linux.star b/infra/config/subprojects/chromium/ci/chromium.linux.star
index c7bebbb..7970051 100644
--- a/infra/config/subprojects/chromium/ci/chromium.linux.star
+++ b/infra/config/subprojects/chromium/ci/chromium.linux.star
@@ -661,8 +661,15 @@
)
ci.thin_tester(
- name = "Linux Tests (Wayland)",
+ name = "linux-wayland-weston-rel-tests",
branch_selector = branches.selector.LINUX_BRANCHES,
+ description_html =
+ "Runs Wayland tests on Weston. See the {} for details.".format(
+ linkify(
+ "https://chromium.googlesource.com/chromium/src/+/main/docs/ozone_overview.md#wayland",
+ "ozone wayland doc",
+ ),
+ ),
parent = "ci/Linux Builder (Wayland)",
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
@@ -702,7 +709,7 @@
# https://crbug.com/1084469
"browser_tests": targets.mixin(
args = [
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.browser_tests_weston.filter",
],
# Only retry the individual failed tests instead of rerunning
# entire shards.
@@ -724,7 +731,7 @@
"interactive_ui_tests": targets.mixin(
# https://crbug.com/1192997
args = [
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter",
],
),
"ozone_x11_unittests": targets.remove(
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
index 6e67893..f5df8dc 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
@@ -507,11 +507,11 @@
)
try_.builder(
- name = "linux-wayland-rel",
+ name = "linux-wayland-weston-rel",
branch_selector = branches.selector.LINUX_BRANCHES,
mirrors = [
"ci/Linux Builder (Wayland)",
- "ci/Linux Tests (Wayland)",
+ "ci/linux-wayland-weston-rel-tests",
],
gn_args = gn_args.config(
configs = [
@@ -525,18 +525,11 @@
# TODO(crbug.com/329118490): Re-enable flake endorser.
check_for_flakiness = False,
check_for_flakiness_with_resultdb = False,
+ contact_team_email = "chrome-linux-engprod@google.com",
coverage_test_types = ["unit", "overall"],
tryjob = try_.job(
location_filters = [
- "chrome/browser/.+(ui|browser)test.+",
- "chrome/browser/ui/views/.+test.+",
- "chrome/browser/ui/views/tabs/.+",
- "testing/xvfb\\.py",
- "third_party/wayland/.+",
- "third_party/wayland-protocols/.+",
"third_party/weston/.+",
- "ui/ozone/platform/wayland/.+",
- "ui/views/widget/.+test.+",
],
),
use_clang_coverage = True,
@@ -563,19 +556,24 @@
check_for_flakiness_with_resultdb = False,
contact_team_email = "chrome-linux-engprod@google.com",
coverage_test_types = ["unit", "overall"],
- # TODO(crbug.com/401284929): Uncomment to add this try builder to CQ once tests are stable on mutter.
- # tryjob = try_.job(
- # location_filters = [
- # "chrome/browser/.+(ui|browser)test.+",
- # "chrome/browser/ui/views/.+test.+",
- # "chrome/browser/ui/views/tabs/.+",
- # "testing/xvfb\\.py",
- # "third_party/wayland/.+",
- # "third_party/wayland-protocols/.+",
- # "ui/ozone/platform/wayland/.+",
- # "ui/views/widget/.+test.+",
- # ],
- # ),
+ tryjob = try_.job(
+ location_filters = [
+ "chrome/browser/.+(ui|browser)test.+",
+ "chrome/browser/ui/views/.+test.+",
+ "chrome/browser/ui/views/tabs/.+",
+ "testing/xvfb\\.py",
+ "third_party/glib/.+",
+ "third_party/gvdb/.+",
+ "third_party/libdisplay-info/.+",
+ "third_party/libgudev/.+",
+ "third_party/libinput/.+",
+ "third_party/mutter/.+",
+ "third_party/wayland/.+",
+ "third_party/wayland-protocols/.+",
+ "ui/ozone/platform/wayland/.+",
+ "ui/views/widget/.+test.+",
+ ],
+ ),
use_clang_coverage = True,
)
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn
index db606952..809e85b 100644
--- a/testing/buildbot/filters/BUILD.gn
+++ b/testing/buildbot/filters/BUILD.gn
@@ -96,7 +96,7 @@
"//testing/buildbot/filters/mac.mac11-arm64-rel.browser_tests.filter",
"//testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter",
"//testing/buildbot/filters/ozone-linux.browser_tests_mutter.filter",
- "//testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter",
+ "//testing/buildbot/filters/ozone-linux.browser_tests_weston.filter",
"//testing/buildbot/filters/pixel_tests.filter",
"//testing/buildbot/filters/trees_in_viz.browser_tests.filter",
"//testing/buildbot/filters/views_ax_chromeos.browser_tests.filter",
@@ -407,7 +407,7 @@
"//testing/buildbot/filters/mac.mac-rel-cft.interactive_ui_tests.filter",
"//testing/buildbot/filters/ozone-linux.interactive_ui_tests.filter",
"//testing/buildbot/filters/ozone-linux.interactive_ui_tests_mutter.filter",
- "//testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter",
+ "//testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter",
"//testing/buildbot/filters/pixel_tests.filter",
"//testing/buildbot/filters/win.win-rel-cft.interactive_ui_tests.filter",
]
diff --git a/testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter b/testing/buildbot/filters/ozone-linux.browser_tests_weston.filter
similarity index 100%
rename from testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter
rename to testing/buildbot/filters/ozone-linux.browser_tests_weston.filter
diff --git a/testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter b/testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter
similarity index 100%
rename from testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter
rename to testing/buildbot/filters/ozone-linux.interactive_ui_tests_weston.filter
