Add S24 tester
Adds a Dawn Samsung S24 CI tester and its trybot mirror. The trybot
will share a pool with the S23 trybot for now until we are less
strapped for capacity.
Bug: 333424893
Change-Id: Ifa96e54817c9f61a619d9203d4632dd6b29ae5a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5437138
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1284997}
diff --git a/infra/config/generated/builder-owners/chrome-gpu-infra@google.com.txt b/infra/config/generated/builder-owners/chrome-gpu-infra@google.com.txt
index 81c33db..77e1314 100644
--- a/infra/config/generated/builder-owners/chrome-gpu-infra@google.com.txt
+++ b/infra/config/generated/builder-owners/chrome-gpu-infra@google.com.txt
@@ -22,6 +22,7 @@
ci/Dawn Android arm64 DEPS Release (Pixel 6)
ci/Dawn Android arm64 Experimental Release (Pixel 6)
ci/Dawn Android arm64 Release (Pixel 6)
+ci/Dawn Android arm64 Release (Samsung S24)
ci/Dawn Linux TSAN Release
ci/Dawn Linux x64 Builder
ci/Dawn Linux x64 DEPS Builder
@@ -144,6 +145,7 @@
try/android-dawn-arm-rel
try/android-dawn-arm64-exp-rel
try/android-dawn-arm64-rel
+try/android-dawn-arm64-s24-rel
try/dawn-android-arm-deps-rel
try/dawn-android-arm64-deps-rel
try/dawn-linux-x64-deps-rel
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
index 97654132..ae21f92 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
@@ -95,6 +95,38 @@
},
"run_tests_serially": true
}
+ },
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-dawn-archive",
+ "builder_group": "chromium.dawn",
+ "execution_mode": "TEST",
+ "legacy_android_config": {
+ "config": "arm64_builder_rel_mb"
+ },
+ "legacy_chromium_config": {
+ "config": "android",
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "dawn_top_of_tree"
+ ],
+ "config": "chromium"
+ },
+ "parent": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ },
+ "run_tests_serially": true
+ }
}
]
},
@@ -115,6 +147,11 @@
"bucket": "ci",
"builder": "Dawn Android arm64 Release (Pixel 6)",
"project": "chromium"
+ },
+ {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
}
],
"mirroring_builder_group_and_names": [
@@ -125,6 +162,10 @@
{
"builder": "android-dawn-arm64-rel",
"group": "tryserver.chromium.dawn"
+ },
+ {
+ "builder": "android-dawn-arm64-s24-rel",
+ "group": "tryserver.chromium.dawn"
}
]
}
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/properties.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/properties.json"
new file mode 100644
index 0000000..c2c69bc
--- /dev/null
+++ "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/properties.json"
@@ -0,0 +1,93 @@
+{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-dawn-archive",
+ "builder_group": "chromium.dawn",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "arm64_builder_rel_mb"
+ },
+ "legacy_chromium_config": {
+ "config": "android",
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "dawn_top_of_tree"
+ ],
+ "config": "chromium"
+ }
+ }
+ },
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-dawn-archive",
+ "builder_group": "chromium.dawn",
+ "execution_mode": "TEST",
+ "legacy_android_config": {
+ "config": "arm64_builder_rel_mb"
+ },
+ "legacy_chromium_config": {
+ "config": "android",
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "dawn_top_of_tree"
+ ],
+ "config": "chromium"
+ },
+ "parent": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ },
+ "run_tests_serially": true
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
+ }
+ ],
+ "mirroring_builder_group_and_names": [
+ {
+ "builder": "android-dawn-arm64-s24-rel",
+ "group": "tryserver.chromium.dawn"
+ }
+ ]
+ }
+ },
+ "$recipe_engine/resultdb/test_presentation": {
+ "column_keys": [],
+ "grouping_keys": [
+ "status",
+ "v.test_suite"
+ ]
+ },
+ "builder_group": "chromium.dawn",
+ "recipe": "chromium",
+ "sheriff_rotations": [
+ "dawn"
+ ]
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/gn_args_locations.json b/infra/config/generated/builders/gn_args_locations.json
index 61b2d69..353d7f3 100644
--- a/infra/config/generated/builders/gn_args_locations.json
+++ b/infra/config/generated/builders/gn_args_locations.json
@@ -686,6 +686,7 @@
"android-dawn-arm-rel": "try/android-dawn-arm-rel/gn-args.json",
"android-dawn-arm64-exp-rel": "try/android-dawn-arm64-exp-rel/gn-args.json",
"android-dawn-arm64-rel": "try/android-dawn-arm64-rel/gn-args.json",
+ "android-dawn-arm64-s24-rel": "try/android-dawn-arm64-s24-rel/gn-args.json",
"dawn-android-arm-deps-rel": "try/dawn-android-arm-deps-rel/gn-args.json",
"dawn-android-arm64-deps-rel": "try/dawn-android-arm64-deps-rel/gn-args.json",
"dawn-linux-x64-deps-rel": "try/dawn-linux-x64-deps-rel/gn-args.json",
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/gn-args.json b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/gn-args.json
new file mode 100644
index 0000000..525ce3af
--- /dev/null
+++ b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/gn-args.json
@@ -0,0 +1,15 @@
+{
+ "gn_args": {
+ "dcheck_always_on": true,
+ "debuggable_apks": false,
+ "ffmpeg_branding": "Chrome",
+ "is_component_build": false,
+ "is_debug": false,
+ "proprietary_codecs": true,
+ "symbol_level": 1,
+ "target_cpu": "arm64",
+ "target_os": "android",
+ "use_remoteexec": true,
+ "use_siso": true
+ }
+}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/properties.json b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/properties.json
new file mode 100644
index 0000000..018aa5a
--- /dev/null
+++ b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/properties.json
@@ -0,0 +1,110 @@
+{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "additional_exclusions": [
+ "infra/config/generated/builders/try/android-dawn-arm64-s24-rel/gn-args.json"
+ ],
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-dawn-archive",
+ "builder_group": "chromium.dawn",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "arm64_builder_rel_mb"
+ },
+ "legacy_chromium_config": {
+ "config": "android",
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "dawn_top_of_tree"
+ ],
+ "config": "chromium"
+ }
+ }
+ },
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-dawn-archive",
+ "builder_group": "chromium.dawn",
+ "execution_mode": "TEST",
+ "legacy_android_config": {
+ "config": "arm64_builder_rel_mb"
+ },
+ "legacy_chromium_config": {
+ "config": "android",
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "dawn_top_of_tree"
+ ],
+ "config": "chromium"
+ },
+ "parent": {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ },
+ "run_tests_serially": true
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Builder",
+ "project": "chromium"
+ }
+ ],
+ "builder_ids_in_scope_for_testing": [
+ {
+ "bucket": "ci",
+ "builder": "Dawn Android arm64 Release (Samsung S24)",
+ "project": "chromium"
+ }
+ ]
+ }
+ },
+ "$build/reclient": {
+ "instance": "rbe-chromium-untrusted",
+ "jobs": 150,
+ "metrics_project": "chromium-reclient-metrics",
+ "scandeps_server": true
+ },
+ "$build/siso": {
+ "configs": [
+ "builder"
+ ],
+ "enable_cloud_profiler": true,
+ "enable_cloud_trace": true,
+ "experiments": [],
+ "project": "rbe-chromium-untrusted"
+ },
+ "$recipe_engine/resultdb/test_presentation": {
+ "column_keys": [],
+ "grouping_keys": [
+ "status",
+ "v.test_suite",
+ "v.gpu"
+ ]
+ },
+ "builder_group": "tryserver.chromium.dawn",
+ "recipe": "chromium_trybot"
+}
\ No newline at end of file
diff --git a/infra/config/generated/cq-usage/mega_cq_bots.txt b/infra/config/generated/cq-usage/mega_cq_bots.txt
index ec0590d9..da68cb7 100644
--- a/infra/config/generated/cq-usage/mega_cq_bots.txt
+++ b/infra/config/generated/cq-usage/mega_cq_bots.txt
@@ -9,6 +9,7 @@
chromium/try/android-dawn-arm-rel
chromium/try/android-dawn-arm64-exp-rel
chromium/try/android-dawn-arm64-rel
+chromium/try/android-dawn-arm64-s24-rel
chromium/try/android-official
chromium/try/android-oreo-x86-rel
chromium/try/android-pie-arm64-dbg
diff --git a/infra/config/generated/health-specs/health-specs.json b/infra/config/generated/health-specs/health-specs.json
index 5166bc4..403e08c 100644
--- a/infra/config/generated/health-specs/health-specs.json
+++ b/infra/config/generated/health-specs/health-specs.json
@@ -1368,6 +1368,27 @@
}
]
},
+ "Dawn Android arm64 Release (Samsung S24)": {
+ "contact_team_email": "chrome-gpu-infra@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"
+ }
+ }
+ ]
+ },
"Dawn Linux TSAN Release": {
"contact_team_email": "chrome-gpu-infra@google.com",
"problem_specs": [
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index c95fb7b..a725dcf 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -852,6 +852,10 @@
includable_only: true
}
builders {
+ name: "chromium/try/android-dawn-arm64-s24-rel"
+ includable_only: true
+ }
+ builders {
name: "chromium/try/android-deterministic-dbg"
includable_only: true
}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 462061b0..8b9d0ab1 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -7467,7 +7467,7 @@
use_invocation_timestamp: true
}
}
- description_html: "Builds Android arm64 binaries using ToT Dawn<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/android-dawn-arm64-exp-rel\">android-dawn-arm64-exp-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/android-dawn-arm64-rel\">android-dawn-arm64-rel</a></li></ul>"
+ description_html: "Builds Android arm64 binaries using ToT Dawn<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/android-dawn-arm64-exp-rel\">android-dawn-arm64-exp-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/android-dawn-arm64-rel\">android-dawn-arm64-rel</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/android-dawn-arm64-s24-rel\">android-dawn-arm64-s24-rel</a></li></ul>"
shadow_builder_adjustments {
service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
pool: "luci.chromium.try"
@@ -7858,6 +7858,101 @@
contact_team_email: "chrome-gpu-infra@google.com"
}
builders {
+ name: "Dawn Android arm64 Release (Samsung S24)"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cores:2"
+ dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
+ dimensions: "os:Ubuntu-22.04"
+ dimensions: "pool:luci.chromium.gpu.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/Dawn Android arm64 Release (Samsung S24)/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "chromium.dawn",'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium",'
+ ' "sheriff_rotations": ['
+ ' "dawn"'
+ ' ]'
+ '}'
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium_swarming.expose_merge_script_failures"
+ 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/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/.+)"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ description_html: "Runs ToT Dawn tests on Samsung S24 devices<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/android-dawn-arm64-s24-rel\">android-dawn-arm64-s24-rel</a></li></ul>"
+ shadow_builder_adjustments {
+ service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+ pool: "luci.chromium.try"
+ dimensions: "free_space:"
+ dimensions: "pool:luci.chromium.try"
+ }
+ contact_team_email: "chrome-gpu-infra@google.com"
+ }
+ builders {
name: "Dawn Linux TSAN Release"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
@@ -68477,6 +68572,101 @@
contact_team_email: "chrome-gpu-infra@google.com"
}
builders {
+ name: "android-dawn-arm64-s24-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "builderless:1"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-22.04"
+ dimensions: "pool:luci.chromium.gpu.android.s23.try"
+ 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/try/android-dawn-arm64-s24-rel/properties.json",'
+ ' "top_level_project": {'
+ ' "ref": "refs/heads/main",'
+ ' "repo": {'
+ ' "host": "chromium.googlesource.com",'
+ ' "project": "chromium/src"'
+ ' }'
+ ' }'
+ ' },'
+ ' "builder_group": "tryserver.chromium.dawn",'
+ ' "led_builder_is_bootstrapped": true,'
+ ' "recipe": "chromium_trybot"'
+ '}'
+ execution_timeout_secs: 14400
+ expiration_secs: 7200
+ grace_period {
+ seconds: 120
+ }
+ build_numbers: YES
+ service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {
+ value: 5
+ }
+ experiments {
+ key: "chromium_swarming.expose_merge_script_failures"
+ value: 100
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ experiments {
+ key: "swarming.prpc.cli"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "try_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "gpu_try_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+ }
+ }
+ }
+ bq_exports {
+ project: "chrome-luci-data"
+ dataset: "chromium"
+ table: "blink_web_tests_try_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ description_html: "Runs ToT Dawn tests on Samsung S24 devices<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Dawn Android arm64 Builder\">Dawn Android arm64 Builder</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Dawn Android arm64 Release (Samsung S24)\">Dawn Android arm64 Release (Samsung S24)</a></li></ul>"
+ contact_team_email: "chrome-gpu-infra@google.com"
+ }
+ builders {
name: "android-deterministic-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 1a7155329..0b91d6c 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -7805,6 +7805,11 @@
short_name: "p6"
}
builders {
+ name: "buildbucket/luci.chromium.ci/Dawn Android arm64 Release (Samsung S24)"
+ category: "ToT|Android"
+ short_name: "s24"
+ }
+ builders {
name: "buildbucket/luci.chromium.ci/Dawn Android arm64 Builder"
category: "ToT|Android|Builder"
short_name: "a64"
@@ -16313,6 +16318,9 @@
name: "buildbucket/luci.chromium.try/android-dawn-arm64-rel"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-dawn-arm64-s24-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/android-deterministic-dbg"
}
builders {
@@ -18044,6 +18052,9 @@
name: "buildbucket/luci.chromium.try/android-dawn-arm64-rel"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-dawn-arm64-s24-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/dawn-android-arm-deps-rel"
}
builders {
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index a9f04b2..bff7c25 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -644,6 +644,15 @@
}
}
job {
+ id: "Dawn Android arm64 Release (Samsung S24)"
+ realm: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "Dawn Android arm64 Release (Samsung S24)"
+ }
+}
+job {
id: "Dawn Linux TSAN Release"
realm: "ci"
buildbucket {
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg
index 52dda2a..598f14f8 100644
--- a/infra/config/generated/luci/realms.cfg
+++ b/infra/config/generated/luci/realms.cfg
@@ -290,6 +290,7 @@
values: "Dawn Android arm64 DEPS Release (Pixel 6)"
values: "Dawn Android arm64 Experimental Release (Pixel 6)"
values: "Dawn Android arm64 Release (Pixel 6)"
+ values: "Dawn Android arm64 Release (Samsung S24)"
values: "Dawn Linux x64 DEPS Release (Intel UHD 630)"
values: "Dawn Linux x64 DEPS Release (NVIDIA)"
values: "Dawn Linux x64 Experimental Release (Intel UHD 630)"
diff --git a/infra/config/generated/sheriff-rotations/dawn.txt b/infra/config/generated/sheriff-rotations/dawn.txt
index 2fa41a0..f75bef41 100644
--- a/infra/config/generated/sheriff-rotations/dawn.txt
+++ b/infra/config/generated/sheriff-rotations/dawn.txt
@@ -9,6 +9,7 @@
ci/Dawn Android arm64 DEPS Release (Pixel 6)
ci/Dawn Android arm64 Experimental Release (Pixel 6)
ci/Dawn Android arm64 Release (Pixel 6)
+ci/Dawn Android arm64 Release (Samsung S24)
ci/Dawn Linux TSAN Release
ci/Dawn Linux x64 Builder
ci/Dawn Linux x64 DEPS Builder
diff --git a/infra/config/generated/testing/mixins.pyl b/infra/config/generated/testing/mixins.pyl
index 863e5c0..a43d80e0 100644
--- a/infra/config/generated/testing/mixins.pyl
+++ b/infra/config/generated/testing/mixins.pyl
@@ -1173,6 +1173,17 @@
},
},
},
+ 'samsung_s24': {
+ 'swarming': {
+ 'dimensions': {
+ 'device_type': 'e2s',
+ 'device_os': 'UP1A.231005.007',
+ 'device_os_type': 'user',
+ 'os': 'Android',
+ 'pool': 'chromium.tests.gpu',
+ },
+ },
+ },
'shards-10': {
'shards': 10,
},
diff --git a/infra/config/subprojects/chromium/ci/chromium.dawn.star b/infra/config/subprojects/chromium/ci/chromium.dawn.star
index 2a083ab..60652da 100644
--- a/infra/config/subprojects/chromium/ci/chromium.dawn.star
+++ b/infra/config/subprojects/chromium/ci/chromium.dawn.star
@@ -551,6 +551,35 @@
)
ci.thin_tester(
+ name = "Dawn Android arm64 Release (Samsung S24)",
+ description_html = "Runs ToT Dawn tests on Samsung S24 devices",
+ triggered_by = ["ci/Dawn Android arm64 Builder"],
+ builder_spec = builder_config.builder_spec(
+ execution_mode = builder_config.execution_mode.TEST,
+ gclient_config = builder_config.gclient_config(
+ config = "chromium",
+ apply_configs = [
+ "android",
+ "dawn_top_of_tree",
+ ],
+ ),
+ chromium_config = builder_config.chromium_config(
+ config = "android",
+ target_platform = builder_config.target_platform.ANDROID,
+ ),
+ android_config = builder_config.android_config(
+ config = "arm64_builder_rel_mb",
+ ),
+ build_gs_bucket = "chromium-dawn-archive",
+ run_tests_serially = True,
+ ),
+ console_view_entry = consoles.console_view_entry(
+ category = "ToT|Android",
+ short_name = "s24",
+ ),
+)
+
+ci.thin_tester(
name = "Dawn Linux x64 Experimental Release (Intel UHD 630)",
description_html = "Runs ToT Dawn tests on experimental Linux/UHD 630 configs",
triggered_by = ["Dawn Linux x64 Builder"],
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.dawn.star b/infra/config/subprojects/chromium/try/tryserver.chromium.dawn.star
index e03720a4..92da3d5 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.dawn.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.dawn.star
@@ -294,6 +294,26 @@
)
try_.builder(
+ # This is not part of "android-dawn-arm64-rel" at the moment since there is
+ # not sufficient S24 capacity for that.
+ name = "android-dawn-arm64-s24-rel",
+ description_html = "Runs ToT Dawn tests on Samsung S24 devices",
+ mirrors = [
+ "ci/Dawn Android arm64 Builder",
+ "ci/Dawn Android arm64 Release (Samsung S24)",
+ ],
+ gn_args = "ci/Dawn Android arm64 Builder",
+ # TODO(crbug.com/333424893): Change this to a dedicated S24 pool once
+ # additional GCE quota is available.
+ pool = "luci.chromium.gpu.android.s23.try",
+ builderless = True,
+ os = os.LINUX_DEFAULT,
+ test_presentation = resultdb.test_presentation(
+ grouping_keys = ["status", "v.test_suite", "v.gpu"],
+ ),
+)
+
+try_.builder(
name = "linux-dawn-intel-exp-rel",
description_html = "Runs ToT Dawn tests on experimental Linux/Intel configs",
mirrors = [
diff --git a/infra/config/targets/mixins.star b/infra/config/targets/mixins.star
index e83f97c..452f34c 100644
--- a/infra/config/targets/mixins.star
+++ b/infra/config/targets/mixins.star
@@ -1515,6 +1515,22 @@
)
targets.mixin(
+ name = "samsung_s24",
+ swarming = targets.swarming(
+ dimensions = {
+ # Unfortunately, "s24" is not exposed as a dimension. "e2s" appears
+ # to refer to the S24 specifically, while "s5e9945" is for the
+ # entire S24 family.
+ "device_type": "e2s",
+ "device_os": "UP1A.231005.007",
+ "device_os_type": "user",
+ "os": "Android",
+ "pool": "chromium.tests.gpu",
+ },
+ ),
+)
+
+targets.mixin(
name = "skia_gold_test",
args = [
"--git-revision=${got_revision}",
diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
index 71fa2a2..82acb21 100644
--- a/testing/buildbot/chromium.dawn.json
+++ b/testing/buildbot/chromium.dawn.json
@@ -1323,6 +1323,46 @@
}
]
},
+ "Dawn Android arm64 Release (Samsung S24)": {
+ "isolated_scripts": [
+ {
+ "args": [
+ "noop_sleep",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+ "--enforce-browser-version"
+ ],
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "noop_sleep_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "UP1A.231005.007",
+ "device_os_type": "user",
+ "device_type": "e2s",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ },
+ "expiration": 21600,
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "telemetry_gpu_integration_test_android_chrome",
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ }
+ ]
+ },
"Dawn Linux TSAN Release": {
"gtest_tests": [
{
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index 863e5c0..a43d80e0 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -1173,6 +1173,17 @@
},
},
},
+ 'samsung_s24': {
+ 'swarming': {
+ 'dimensions': {
+ 'device_type': 'e2s',
+ 'device_os': 'UP1A.231005.007',
+ 'device_os_type': 'user',
+ 'os': 'Android',
+ 'pool': 'chromium.tests.gpu',
+ },
+ },
+ },
'shards-10': {
'shards': 10,
},
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 3876f1e..be06d00 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2504,6 +2504,20 @@
'isolated_scripts': 'gpu_dawn_android_isolated_scripts',
},
},
+ 'Dawn Android arm64 Release (Samsung S24)': {
+ 'browser_config': 'android-chromium',
+ 'os_type': 'android',
+ 'skip_merge_script': True,
+ 'mixins': [
+ 'has_native_resultdb_integration',
+ 'samsung_s24',
+ 'limited_capacity_bot',
+ ],
+ 'test_suites': {
+ # TODO(crbug.com/333424893): Enable tests.
+ 'gpu_telemetry_tests': 'gpu_noop_sleep_telemetry_test',
+ },
+ },
'Dawn Linux TSAN Release': {
# This bot doesn't run any Telemetry-based tests so doesn't
# need the browser_config parameter.
