Remove linux-dbg-compile Removes the builder entry for linux-dbg-compile from legacy_builders.star and enables the src-side equivalent on the CQ. Bug: angleproject:475260235 Change-Id: I785bbfc43ed375b28b3e2f56b185d08c1590e3c1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7780526 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
diff --git a/infra/config/angle_v2_try.star b/infra/config/angle_v2_try.star index 10657a2..5067cef 100644 --- a/infra/config/angle_v2_try.star +++ b/infra/config/angle_v2_try.star
@@ -119,9 +119,6 @@ "ci/angle-linux-x64-builder-dbg", ], gn_args = "ci/angle-linux-x64-builder-dbg", - # TODO(anglebug.com/475260235): Add this to the CQ once the "all" target - # is confirmed to work properly. - cq_settings = try_.cq_settings(includable_only = True), ) angle_linux_functional_cq_tester(
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg index fafe438..a71ddfd 100644 --- a/infra/config/generated/luci/commit-queue.cfg +++ b/infra/config/generated/luci/commit-queue.cfg
@@ -56,8 +56,22 @@ } builders { name: "angle/try/angle-cq-linux-x64-dbg" - includable_only: true disable_reuse_footers: "Include-Ci-Only-Tests" + 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: "infra/config/generated/builders/try/angle-cq-linux-x64-dbg/.+" + } + mode_allowlist: "DRY_RUN" + mode_allowlist: "FULL_RUN" } builders { name: "angle/try/angle-cq-linux-x64-rel" @@ -348,9 +362,6 @@ name: "angle/try/linux-asan-test" } builders { - name: "angle/try/linux-dbg-compile" - } - builders { name: "angle/try/linux-tsan-test" } builders {
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index e6ee098..cf65e2c 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -6372,62 +6372,6 @@ } } builders { - name: "linux-dbg-compile" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "os:Ubuntu" - 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": "linux",' - ' "recipe": "angle",' - ' "sheriff_rotations": [' - ' "angle"' - ' ],' - ' "test_mode": "compile_only",' - ' "toolchain": "clang"' - '}' - execution_timeout_secs: 10800 - 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: "linux-exp-asan-test" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -13791,52 +13735,6 @@ } } builders { - name: "linux-dbg-compile" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "os:Ubuntu" - 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-untrusted"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [' - ' "v.gpu"' - ' ],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "angle",' - ' "platform": "linux",' - ' "recipe": "angle",' - ' "test_mode": "compile_only",' - ' "toolchain": "clang"' - '}' - build_numbers: YES - service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 100 - } - resultdb { - enable: true - } - } - builders { name: "linux-exp-asan-test" 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 112413d..ad0399d 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg
@@ -36,11 +36,6 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.angle.ci/linux-dbg-compile" - category: "compile|linux|x64" - short_name: "dbg" - } - builders { name: "buildbucket/luci.angle.ci/angle-linux-x64-builder-rel" category: "compile|linux|x64" short_name: "rel" @@ -409,9 +404,6 @@ name: "buildbucket/luci.angle.try/linux-asan-test" } builders { - name: "buildbucket/luci.angle.try/linux-dbg-compile" - } - builders { name: "buildbucket/luci.angle.try/linux-exp-asan-test" } builders {
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index 0484f28..e3f25fa 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -370,19 +370,6 @@ } } job { - id: "linux-dbg-compile" - realm: "ci" - triggering_policy { - kind: LOGARITHMIC_BATCHING - log_base: 2 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "linux-dbg-compile" - } -} -job { id: "linux-exp-asan-test" realm: "ci" triggering_policy { @@ -634,7 +621,6 @@ triggers: "angle-win-x64-builder-rel" triggers: "angle-win-x86-builder-rel" triggers: "linux-asan-test" - triggers: "linux-dbg-compile" triggers: "linux-exp-asan-test" triggers: "linux-exp-tsan-test" triggers: "linux-intel-uhd630-perf"
diff --git a/infra/config/legacy_builders.star b/infra/config/legacy_builders.star index 75b1407..bbc9109 100644 --- a/infra/config/legacy_builders.star +++ b/infra/config/legacy_builders.star
@@ -315,7 +315,6 @@ angle_builder("linux-exp-asan-test", cpu = "x64") angle_builder("linux-exp-tsan-test", cpu = "x64") angle_builder("linux-tsan-test", cpu = "x64") -angle_builder("linux-dbg-compile", cpu = "x64") angle_builder("mac-dbg-compile", cpu = "x64") angle_builder("win-asan-test", cpu = "x64") angle_builder("win-dbg-compile", cpu = "x64")