Remove win-perf builders Removes the Starlark entries for the win-perf builders from legacy_builders.star since src-side equivalents are now available. Bug: angleproject:475260235 Change-Id: I3a34dc59a4103d4ae35ef80d2b0fe909edef538c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7783680 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index d465e16..a0f5eff 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -8639,118 +8639,6 @@ } } builders { - name: "win10-intel-uhd630-perf" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "os:Windows" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/siso": {' - ' "configs": [' - ' "builder"' - ' ],' - ' "enable_cloud_monitoring": true,' - ' "enable_cloud_profiler": true,' - ' "enable_cloud_trace": true,' - ' "project": "rbe-chromium-trusted"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [' - ' "v.gpu"' - ' ],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "angle",' - ' "gardener_rotations": [' - ' "angle"' - ' ],' - ' "platform": "win",' - ' "recipe": "angle",' - ' "sheriff_rotations": [' - ' "angle"' - ' ],' - ' "test_mode": "compile_and_test",' - ' "toolchain": "clang"' - '}' - execution_timeout_secs: 18000 - build_numbers: YES - service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 100 - } - resultdb { - enable: true - } - shadow_builder_adjustments { - service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" - } - } - builders { - name: "win10-nvidia-gtx1660-perf" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "os:Windows" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/siso": {' - ' "configs": [' - ' "builder"' - ' ],' - ' "enable_cloud_monitoring": true,' - ' "enable_cloud_profiler": true,' - ' "enable_cloud_trace": true,' - ' "project": "rbe-chromium-trusted"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [' - ' "v.gpu"' - ' ],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "angle",' - ' "gardener_rotations": [' - ' "angle"' - ' ],' - ' "platform": "win",' - ' "recipe": "angle",' - ' "sheriff_rotations": [' - ' "angle"' - ' ],' - ' "test_mode": "compile_and_test",' - ' "toolchain": "clang"' - '}' - execution_timeout_secs: 18000 - build_numbers: YES - service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 100 - } - resultdb { - enable: true - } - shadow_builder_adjustments { - service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" - } - } - builders { name: "winuwp-compile" 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 d554587..718063a 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg
@@ -141,16 +141,6 @@ short_name: "nvidia" } builders { - name: "buildbucket/luci.angle.ci/win10-intel-uhd630-perf" - category: "perf|win|x64" - short_name: "intel" - } - builders { - name: "buildbucket/luci.angle.ci/win10-nvidia-gtx1660-perf" - category: "perf|win|x64" - short_name: "nvidia" - } - builders { name: "buildbucket/luci.angle.ci/angle-android-arm64-google-pixel10-rel" category: "test|android|arm64|rel" short_name: "p10"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index 5e7a4ff..20389e3 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -554,32 +554,6 @@ } } job { - id: "win10-intel-uhd630-perf" - realm: "ci" - triggering_policy { - kind: LOGARITHMIC_BATCHING - log_base: 2 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "win10-intel-uhd630-perf" - } -} -job { - id: "win10-nvidia-gtx1660-perf" - realm: "ci" - triggering_policy { - kind: LOGARITHMIC_BATCHING - log_base: 2 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "win10-nvidia-gtx1660-perf" - } -} -job { id: "winuwp-compile" realm: "ci" triggering_policy { @@ -636,8 +610,6 @@ triggers: "win-msvc-x86-dbg-compile" triggers: "win-trace" triggers: "win-x86-dbg-compile" - triggers: "win10-intel-uhd630-perf" - triggers: "win10-nvidia-gtx1660-perf" triggers: "winuwp-compile" triggers: "winuwp-dbg-compile" gitiles {
diff --git a/infra/config/legacy_builders.star b/infra/config/legacy_builders.star index 929b9bf..970d0e5 100644 --- a/infra/config/legacy_builders.star +++ b/infra/config/legacy_builders.star
@@ -324,8 +324,6 @@ angle_builder("android-pixel6-perf", cpu = "arm64") angle_builder("linux-intel-uhd630-perf", cpu = "x64") angle_builder("linux-nvidia-gtx1660-perf", cpu = "x64") -angle_builder("win10-intel-uhd630-perf", cpu = "x64") -angle_builder("win10-nvidia-gtx1660-perf", cpu = "x64") # CQ