From 583fd2ba9961137d9b7df5e9fc917f6cc7c82e80 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Tue, 6 Dec 2022 08:21:02 +0000 Subject: [PATCH] Revert "Add reclient CQ shadow builders as experimental" This reverts commit e149d4d1000424d897e72ea4ef7aa2b777842e8d. Reason for revert: Reason for revert: These builders seems blocking CQ. http://screen/44GuRKkhNHdwj8j Original change's description: > Add reclient CQ shadow builders as experimental > > FWIU, setting exprimental=True makes CQ builders non-blocking. > If not, please revert this CL. > > Bug: b/243594984 > Change-Id: Ia20e37f4fe9ce629d6fddc9ab8b652b5b8a00572 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286522 > Reviewed-by: Mirko Bonadei > Auto-Submit: Junji Watanabe > Commit-Queue: Junji Watanabe > Cr-Commit-Position: refs/heads/main@{#38817} Bug: b/243594984 Change-Id: Ie3dd7707a920c68c53cb80bf5f86737c7f559393 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286543 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Auto-Submit: Junji Watanabe Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#38818} --- infra/config/commit-queue.cfg | 30 -- infra/config/config.star | 6 - infra/config/cr-buildbucket.cfg | 510 -------------------------------- infra/config/luci-milo.cfg | 15 - infra/config/luci-notify.cfg | 65 ---- infra/config/project.cfg | 2 +- 6 files changed, 1 insertion(+), 627 deletions(-) diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg index 5640e2fd23..1c703c7022 100644 --- a/infra/config/commit-queue.cfg +++ b/infra/config/commit-queue.cfg @@ -46,9 +46,6 @@ config_groups { builders { name: "webrtc/try/android_arm_rel" } - builders { - name: "webrtc/try/android_arm_rel_reclient" - } builders { name: "webrtc/try/android_chromium_compile" } @@ -76,9 +73,6 @@ config_groups { builders { name: "webrtc/try/ios_compile_arm64_rel" } - builders { - name: "webrtc/try/ios_compile_arm64_rel_reclient" - } builders { name: "webrtc/try/ios_sim_x64_dbg_ios12" } @@ -127,9 +121,6 @@ config_groups { builders { name: "webrtc/try/linux_rel" } - builders { - name: "webrtc/try/linux_rel_reclient" - } builders { name: "webrtc/try/linux_tsan2" } @@ -163,9 +154,6 @@ config_groups { builders { name: "webrtc/try/mac_rel_m1" } - builders { - name: "webrtc/try/mac_rel_reclient" - } builders { name: "webrtc/try/presubmit" disable_reuse: true @@ -185,9 +173,6 @@ config_groups { builders { name: "webrtc/try/win_compile_x64_clang_rel" } - builders { - name: "webrtc/try/win_compile_x64_clang_rel_reclient" - } builders { name: "webrtc/try/win_compile_x86_clang_dbg" } @@ -234,9 +219,6 @@ config_groups { builders { name: "webrtc/try/android_arm_rel" } - builders { - name: "webrtc/try/android_arm_rel_reclient" - } builders { name: "webrtc/try/android_compile_arm64_rel" } @@ -261,9 +243,6 @@ config_groups { builders { name: "webrtc/try/ios_compile_arm64_rel" } - builders { - name: "webrtc/try/ios_compile_arm64_rel_reclient" - } builders { name: "webrtc/try/ios_sim_x64_dbg_ios12" } @@ -306,9 +285,6 @@ config_groups { builders { name: "webrtc/try/linux_rel" } - builders { - name: "webrtc/try/linux_rel_reclient" - } builders { name: "webrtc/try/linux_tsan2" } @@ -339,9 +315,6 @@ config_groups { builders { name: "webrtc/try/mac_rel_m1" } - builders { - name: "webrtc/try/mac_rel_reclient" - } builders { name: "webrtc/try/presubmit" disable_reuse: true @@ -355,9 +328,6 @@ config_groups { builders { name: "webrtc/try/win_compile_x64_clang_rel" } - builders { - name: "webrtc/try/win_compile_x64_clang_rel_reclient" - } builders { name: "webrtc/try/win_compile_x86_clang_dbg" } diff --git a/infra/config/config.star b/infra/config/config.star index 17b2aa70bc..1c6024250a 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -597,7 +597,6 @@ def try_builder( properties = properties or {} properties["builder_group"] = "tryserver.webrtc" properties.update(make_goma_properties(enable_ats = goma_enable_ats, jobs = goma_jobs)) - properties.update(make_reclient_properties("rbe-webrtc-untrusted")) if cq != None: luci.cq_tryjob_verifier(name, cq_group = "cq", **cq) if branch_cq: @@ -713,7 +712,6 @@ android_try_job("android_compile_arm_dbg", cq = None) android_try_job("android_arm_dbg") android_builder("Android32", "Android|arm|rel") android_try_job("android_arm_rel") -android_try_job("android_arm_rel_reclient", experimental = True) android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True) android_try_job("android_compile_arm_rel") perf_builder("Perf Android32 (M Nexus5)", "Android|arm|Tester|M Nexus5", triggered_by = ["Android32 Builder arm"]) @@ -744,7 +742,6 @@ ios_builder("iOS64 Debug", "iOS|arm64|dbg") ios_try_job("ios_compile_arm64_dbg") ios_builder("iOS64 Release", "iOS|arm64|rel") ios_try_job("ios_compile_arm64_rel") -ios_try_job("ios_compile_arm64_rel_reclient", experimental = True) ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14") ios_try_job("ios_sim_x64_dbg_ios14") ios_builder("iOS64 Sim Debug (iOS 13)", "iOS|x64|13") @@ -763,7 +760,6 @@ linux_try_job("linux_dbg", cq = None) linux_try_job("linux_compile_dbg") linux_builder("Linux64 Release", "Linux|x64|rel") linux_try_job("linux_rel") -linux_try_job("linux_rel_reclient", experimental = True) linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True) linux_try_job("linux_compile_rel") perf_builder("Perf Linux Bionic", "Linux|x64|Tester|Bionic", triggered_by = ["Linux64 Builder"]) @@ -804,7 +800,6 @@ mac_try_job("mac_compile_dbg") mac_builder("Mac64 Release", "Mac|x64|rel") mac_try_job("mac_rel") -mac_try_job("mac_rel_reclient", experimental = True) mac_try_job("mac_compile_rel", cq = None) mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|") mac_builder("MacArm64 Builder", ci_cat = None, perf_cat = "Mac|arm64|Builder|") @@ -832,7 +827,6 @@ win_try_job("win_compile_x64_clang_dbg") win_builder("Win64 Release (Clang)", "Win Clang|x64|rel") win_try_job("win_x64_clang_rel", cq = None) win_try_job("win_compile_x64_clang_rel") -win_try_job("win_compile_x64_clang_rel_reclient", experimental = True) win_builder("Win64 ASan", "Win Clang|x64|asan") win_try_job("win_asan") win_builder("Win (more configs)", "Win Clang|x86|more") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index a5faff5b7a..e9829614e4 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -3220,10 +3220,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3270,10 +3266,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3320,10 +3312,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3370,10 +3358,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3420,10 +3404,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3452,57 +3432,6 @@ buckets { } } } - builders { - name: "android_arm_rel_reclient" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Linux" - dimensions: "pool:luci.webrtc.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "tryserver.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experimental: YES - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "try_test_results" - test_results {} - } - } - } builders { name: "android_chromium_compile" swarming_host: "chromium-swarm.appspot.com" @@ -3521,10 +3450,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3571,10 +3496,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3621,10 +3542,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3671,10 +3588,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3721,10 +3634,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3771,10 +3680,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3821,10 +3726,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3871,10 +3772,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3921,10 +3818,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -3972,10 +3865,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4022,10 +3911,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4077,10 +3962,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4132,10 +4013,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4169,62 +4046,6 @@ buckets { } } } - builders { - name: "ios_compile_arm64_rel_reclient" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac" - dimensions: "pool:luci.webrtc.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "tryserver.webrtc",' - ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "13c100"' - '}' - priority: 30 - execution_timeout_secs: 7200 - caches { - name: "xcode_ios_13c100" - path: "xcode_ios_13c100.app" - } - build_numbers: YES - service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experimental: YES - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "try_test_results" - test_results {} - } - } - } builders { name: "ios_sim_x64_dbg_ios12" swarming_host: "chromium-swarm.appspot.com" @@ -4243,10 +4064,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4298,10 +4115,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4353,10 +4166,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4409,10 +4218,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4460,10 +4265,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4511,10 +4312,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4562,10 +4359,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4613,10 +4406,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4664,10 +4453,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4715,10 +4500,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4766,10 +4547,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4817,10 +4594,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4868,10 +4641,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4919,10 +4688,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -4970,10 +4735,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5021,10 +4782,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5072,10 +4829,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5123,10 +4876,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5155,58 +4904,6 @@ buckets { } } } - builders { - name: "linux_rel_reclient" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "inside_docker:0" - dimensions: "os:Linux" - dimensions: "pool:luci.webrtc.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "tryserver.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experimental: YES - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "try_test_results" - test_results {} - } - } - } builders { name: "linux_tsan2" swarming_host: "chromium-swarm.appspot.com" @@ -5226,10 +4923,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5277,10 +4970,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5328,10 +5017,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5379,10 +5064,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5430,10 +5111,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5480,10 +5157,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5530,10 +5203,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5580,10 +5249,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5630,10 +5295,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5680,10 +5341,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5730,10 +5387,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5780,10 +5433,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5830,10 +5479,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5862,57 +5507,6 @@ buckets { } } } - builders { - name: "mac_rel_reclient" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac" - dimensions: "pool:luci.webrtc.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "tryserver.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experimental: YES - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "try_test_results" - test_results {} - } - } - } builders { name: "presubmit" swarming_host: "chromium-swarm.appspot.com" @@ -5932,10 +5526,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -5985,10 +5575,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6037,10 +5623,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6089,10 +5671,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6140,10 +5718,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6191,10 +5765,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6223,58 +5793,6 @@ buckets { } } } - builders { - name: "win_compile_x64_clang_rel_reclient" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Windows" - dimensions: "pool:luci.webrtc.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "enable_ats": false,' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "tryserver.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experimental: YES - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "try_test_results" - test_results {} - } - } - } builders { name: "win_compile_x86_clang_dbg" swarming_host: "chromium-swarm.appspot.com" @@ -6294,10 +5812,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6345,10 +5859,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6396,10 +5906,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6447,10 +5953,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6498,10 +6000,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6549,10 +6047,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' @@ -6600,10 +6094,6 @@ buckets { ' "server_host": "goma.chromium.org",' ' "use_luci_auth": true' ' },' - ' "$build/reclient": {' - ' "instance": "rbe-webrtc-untrusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' ' "$recipe_engine/resultdb/test_presentation": {' ' "column_keys": [],' ' "grouping_keys": [' diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index d8cb1074a0..08bf4fb76e 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -465,9 +465,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/android_arm_rel" } - builders { - name: "buildbucket/luci.webrtc.try/android_arm_rel_reclient" - } builders { name: "buildbucket/luci.webrtc.try/android_compile_arm_rel" } @@ -507,9 +504,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/ios_compile_arm64_rel" } - builders { - name: "buildbucket/luci.webrtc.try/ios_compile_arm64_rel_reclient" - } builders { name: "buildbucket/luci.webrtc.try/ios_sim_x64_dbg_ios14" } @@ -537,9 +531,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/linux_rel" } - builders { - name: "buildbucket/luci.webrtc.try/linux_rel_reclient" - } builders { name: "buildbucket/luci.webrtc.try/linux_compile_rel" } @@ -597,9 +588,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/mac_rel" } - builders { - name: "buildbucket/luci.webrtc.try/mac_rel_reclient" - } builders { name: "buildbucket/luci.webrtc.try/mac_compile_rel" } @@ -639,9 +627,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/win_compile_x64_clang_rel" } - builders { - name: "buildbucket/luci.webrtc.try/win_compile_x64_clang_rel_reclient" - } builders { name: "buildbucket/luci.webrtc.try/win_asan" } diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index c9038914b2..c4fb2aa1d7 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -1612,19 +1612,6 @@ notifiers { name: "android_arm_rel" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "android_arm_rel_reclient" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -1794,19 +1781,6 @@ notifiers { name: "ios_compile_arm64_rel" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "ios_compile_arm64_rel_reclient" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -2041,19 +2015,6 @@ notifiers { name: "linux_rel" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "linux_rel_reclient" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -2223,19 +2184,6 @@ notifiers { name: "mac_rel_m1" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "mac_rel_reclient" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -2314,19 +2262,6 @@ notifiers { name: "win_compile_x64_clang_rel" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "win_compile_x64_clang_rel_reclient" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE diff --git a/infra/config/project.cfg b/infra/config/project.cfg index d35a697fd0..ef07d893f1 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.35.2" + version: "1.33.7" package_dir: "." config_dir: "." entry_point: "config.star"