diff --git a/infra/config/generated/builders/ci/linux-chromeos-annotator-rel/properties.json b/infra/config/generated/builders/ci/linux-chromeos-annotator-rel/properties.json deleted file mode 100644 index 12f2d47579998..0000000000000 --- a/infra/config/generated/builders/ci/linux-chromeos-annotator-rel/properties.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "$build/chromium_tests_builder_config": { - "builder_config": { - "builder_db": { - "entries": [ - { - "builder_id": { - "bucket": "ci", - "builder": "linux-chromeos-annotator-rel", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-fyi-archive", - "builder_group": "chromium.fyi", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "chromeos" - ], - "config": "chromium" - } - } - } - ] - }, - "builder_ids": [ - { - "bucket": "ci", - "builder": "linux-chromeos-annotator-rel", - "project": "chromium" - } - ] - } - }, - "$build/reclient": { - "instance": "rbe-chromium-trusted", - "jobs": 500, - "metrics_project": "chromium-reclient-metrics" - }, - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_group": "chromium.fyi", - "recipe": "chromium", - "sheriff_rotations": [ - "chrome_browser_release" - ] -} \ No newline at end of file diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index 9bf60d929eacf..d757892bdcefb 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg @@ -7819,98 +7819,6 @@ buckets { } } } - builders { - name: "linux-chromeos-annotator-rel" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "cores:8" - dimensions: "cpu:x86-64" - dimensions: "free_space:standard" - dimensions: "os:Ubuntu-18.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-chromeos-annotator-rel/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/branch-heads/5481",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "builder_group": "chromium.fyi",' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium",' - ' "sheriff_rotations": [' - ' "chrome_browser_release"' - ' ]' - '}' - priority: 35 - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 100 - } - experiments { - key: "luci.buildbucket.omit_python2" - 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://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - } builders { name: "linux-chromeos-dbg" swarming_host: "chromium-swarm.appspot.com" diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg index f3a782443f29e..d65b0c4fd4fe2 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg @@ -491,11 +491,6 @@ consoles { name: "buildbucket/luci.chromium-m110.ci/VR Linux" category: "chromium.fyi|linux" } - builders { - name: "buildbucket/luci.chromium-m110.ci/linux-chromeos-annotator-rel" - category: "chromium.fyi|release" - short_name: "rel" - } header { oncalls { name: "Chromium Branches" @@ -1611,11 +1606,6 @@ consoles { name: "buildbucket/luci.chromium-m110.ci/VR Linux" category: "linux" } - builders { - name: "buildbucket/luci.chromium-m110.ci/linux-chromeos-annotator-rel" - category: "release" - short_name: "rel" - } header { oncalls { name: "Chromium Branches" diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index d8f849569ee3e..d32be06caba4f 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg @@ -778,15 +778,6 @@ job { builder: "lacros-arm64-generic-rel" } } -job { - id: "linux-chromeos-annotator-rel" - realm: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "linux-chromeos-annotator-rel" - } -} job { id: "linux-chromeos-dbg" realm: "ci" @@ -952,7 +943,6 @@ trigger { triggers: "lacros-amd64-generic-rel" triggers: "lacros-arm-generic-rel" triggers: "lacros-arm64-generic-rel" - triggers: "linux-chromeos-annotator-rel" triggers: "linux-chromeos-dbg" triggers: "linux-chromeos-rel" triggers: "linux-lacros-builder-rel" diff --git a/infra/config/generated/luci/project.cfg b/infra/config/generated/luci/project.cfg index 931607e58818f..5c2178c10e61b 100644 --- a/infra/config/generated/luci/project.cfg +++ b/infra/config/generated/luci/project.cfg @@ -7,7 +7,7 @@ name: "chromium-m110" access: "group:all" lucicfg { - version: "1.35.3" + version: "1.37.0" package_dir: "../.." config_dir: "generated/luci" entry_point: "main.star" diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star index 6a696067fe958..5bfe43da3da90 100644 --- a/infra/config/subprojects/chromium/ci/chromium.fyi.star +++ b/infra/config/subprojects/chromium/ci/chromium.fyi.star @@ -390,7 +390,6 @@ ci.builder( ci.builder( name = "linux-chromeos-annotator-rel", - branch_selector = branches.STANDARD_MILESTONE, builder_spec = builder_config.builder_spec( gclient_config = builder_config.gclient_config( config = "chromium",