diff --git a/infra/config/config.star b/infra/config/config.star index 51112a043c..3a09f3bafc 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -58,11 +58,6 @@ def make_reclient_properties(instance, jobs = None): # useful when a failure can be safely ignored while fixing it without # blocking the LKGR finder on it. skipped_lkgr_bots = [ - "Android32 (M Nexus5X)(reclient)", - "Linux64 Release (reclient)", - "Mac64 Release (reclient)", - "Win64 Release (Clang)(reclient)", - "iOS64 Release (reclient)", "Fuchsia Release", ] @@ -405,8 +400,7 @@ luci.tree_closer( "compile", "gn", ], - # TODO(b/239908030, b/243594984): remove reclient builders after migration. - failed_step_regexp_exclude = ".*(\\(experimental\\)|\\(reclient\\)).*", + failed_step_regexp_exclude = ".*\\(experimental\\).*", ) # Recipe definitions: @@ -713,7 +707,6 @@ android_builder("Android32 (M Nexus5X)(dbg)", "Android|arm|dbg") android_try_job("android_compile_arm_dbg", cq = None) android_try_job("android_arm_dbg") android_builder("Android32 (M Nexus5X)", "Android|arm|rel") -android_builder("Android32 (M Nexus5X)(reclient)", "Android|arm|re") android_try_job("android_arm_rel") android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True) android_try_job("android_compile_arm_rel") @@ -741,7 +734,6 @@ android_try_job("android_chromium_compile", recipe = "chromium_trybot", branch_c ios_builder("iOS64 Debug", "iOS|arm64|dbg") ios_try_job("ios_compile_arm64_dbg") ios_builder("iOS64 Release", "iOS|arm64|rel") -ios_builder("iOS64 Release (reclient)", "iOS|arm64|re") ios_try_job("ios_compile_arm64_rel") ios_builder("iOS64 Sim Debug (iOS 14)", "iOS|x64|14") ios_try_job("ios_sim_x64_dbg_ios14") @@ -760,7 +752,6 @@ linux_builder("Linux64 Debug", "Linux|x64|dbg") linux_try_job("linux_dbg", cq = None) linux_try_job("linux_compile_dbg") linux_builder("Linux64 Release", "Linux|x64|rel") -linux_builder("Linux64 Release (reclient)", "Linux|x64|re") linux_try_job("linux_rel") linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True) linux_try_job("linux_compile_rel") @@ -796,7 +787,6 @@ mac_builder("Mac64 Debug", "Mac|x64|dbg") mac_try_job("mac_dbg", cq = None) mac_try_job("mac_compile_dbg") mac_builder("Mac64 Release", "Mac|x64|rel") -mac_builder("Mac64 Release (reclient)", "Mac|x64|re") mac_try_job("mac_rel") mac_try_job("mac_compile_rel", cq = None) mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|") @@ -824,7 +814,6 @@ win_try_job("win_x64_clang_dbg", cq = None) win_try_job("win_x64_clang_dbg_win10", cq = None) win_try_job("win_compile_x64_clang_dbg") win_builder("Win64 Release (Clang)", "Win Clang|x64|rel") -win_builder("Win64 Release (Clang)(reclient)", "Win Clang|x64|re") win_try_job("win_x64_clang_rel", cq = None) win_try_job("win_compile_x64_clang_rel") win_builder("Win64 ASan", "Win Clang|x64|asan") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 87dd3d699f..706068dfcb 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -114,56 +114,6 @@ buckets { } } } - builders { - name: "Android32 (M Nexus5X)(reclient)" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Linux" - dimensions: "pool:luci.webrtc.ci" - 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-trusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "ci_test_results" - test_results {} - } - } - } builders { name: "Android32 (more configs)" swarming_host: "chromium-swarm.appspot.com" @@ -1230,57 +1180,6 @@ buckets { } } } - builders { - name: "Linux64 Release (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.ci" - 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-trusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "ci_test_results" - test_results {} - } - } - } builders { name: "Mac Asan" swarming_host: "chromium-swarm.appspot.com" @@ -1431,56 +1330,6 @@ buckets { } } } - builders { - name: "Mac64 Release (reclient)" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac" - dimensions: "pool:luci.webrtc.ci" - 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-trusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "ci_test_results" - test_results {} - } - } - } builders { name: "MacARM64 M1 Release" swarming_host: "chromium-swarm.appspot.com" @@ -1831,56 +1680,6 @@ buckets { } } } - builders { - name: "Win64 Release (Clang)(reclient)" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Windows" - dimensions: "pool:luci.webrtc.ci" - 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-trusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.webrtc",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 7200 - build_numbers: YES - service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "ci_test_results" - test_results {} - } - } - } builders { name: "iOS API Framework Builder" swarming_host: "chromium-swarm.appspot.com" @@ -2046,61 +1845,6 @@ buckets { } } } - builders { - name: "iOS64 Release (reclient)" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac" - dimensions: "pool:luci.webrtc.ci" - 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-trusted",' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.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-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "ci_test_results" - test_results {} - } - } - } builders { name: "iOS64 Sim Debug (iOS 12)" swarming_host: "chromium-swarm.appspot.com" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index 3ed012bcd3..665fd8dcb9 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -21,11 +21,6 @@ consoles { category: "Android|arm" short_name: "rel" } - builders { - name: "buildbucket/luci.webrtc.ci/Android32 (M Nexus5X)(reclient)" - category: "Android|arm" - short_name: "re" - } builders { name: "buildbucket/luci.webrtc.perf/Android32 Builder arm" category: "Android|arm" @@ -71,11 +66,6 @@ consoles { category: "iOS|arm64" short_name: "rel" } - builders { - name: "buildbucket/luci.webrtc.ci/iOS64 Release (reclient)" - category: "iOS|arm64" - short_name: "re" - } builders { name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 14)" category: "iOS|x64" @@ -116,11 +106,6 @@ consoles { category: "Linux|x64" short_name: "rel" } - builders { - name: "buildbucket/luci.webrtc.ci/Linux64 Release (reclient)" - category: "Linux|x64" - short_name: "re" - } builders { name: "buildbucket/luci.webrtc.perf/Linux64 Builder" category: "Linux|x64" @@ -196,11 +181,6 @@ consoles { category: "Mac|x64" short_name: "rel" } - builders { - name: "buildbucket/luci.webrtc.ci/Mac64 Release (reclient)" - category: "Mac|x64" - short_name: "re" - } builders { name: "buildbucket/luci.webrtc.ci/Mac Asan" category: "Mac|x64" @@ -231,11 +211,6 @@ consoles { category: "Win Clang|x64" short_name: "rel" } - builders { - name: "buildbucket/luci.webrtc.ci/Win64 Release (Clang)(reclient)" - category: "Win Clang|x64" - short_name: "re" - } builders { name: "buildbucket/luci.webrtc.ci/Win64 ASan" category: "Win Clang|x64" diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index c429301fba..0881ff31c7 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -28,7 +28,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -55,29 +55,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "ci" - name: "Android32 (M Nexus5X)(reclient)" - repository: "https://webrtc.googlesource.com/src" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -104,7 +82,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -131,7 +109,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -158,7 +136,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -185,7 +163,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -212,7 +190,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -261,7 +239,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -288,7 +266,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -315,7 +293,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -342,7 +320,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -369,7 +347,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -396,7 +374,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -423,7 +401,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -450,7 +428,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -477,7 +455,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -504,7 +482,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -531,7 +509,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -558,7 +536,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -585,7 +563,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -612,7 +590,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -639,29 +617,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "ci" - name: "Linux64 Release (reclient)" - repository: "https://webrtc.googlesource.com/src" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -688,7 +644,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -715,7 +671,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -742,29 +698,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "ci" - name: "Mac64 Release (reclient)" - repository: "https://webrtc.googlesource.com/src" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -791,7 +725,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -818,7 +752,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -845,7 +779,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -872,7 +806,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -899,7 +833,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -926,7 +860,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -953,29 +887,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "ci" - name: "Win64 Release (Clang)(reclient)" - repository: "https://webrtc.googlesource.com/src" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1002,7 +914,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1029,7 +941,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1056,29 +968,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "ci" - name: "iOS64 Release (reclient)" - repository: "https://webrtc.googlesource.com/src" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1105,7 +995,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1132,7 +1022,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1159,7 +1049,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1228,7 +1118,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1255,7 +1145,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1282,7 +1172,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1309,7 +1199,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1336,7 +1226,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { @@ -1539,7 +1429,7 @@ notifiers { tree_closers { tree_status_host: "webrtc-status.appspot.com" failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" - failed_step_regexp_exclude: ".*(\\(experimental\\)|\\(reclient\\)).*" + failed_step_regexp_exclude: ".*\\(experimental\\).*" } } notifiers { diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 1234aca9fa..b5a4e68442 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -24,16 +24,6 @@ job { builder: "Android32 (M Nexus5X)(dbg)" } } -job { - id: "Android32 (M Nexus5X)(reclient)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "Android32 (M Nexus5X)(reclient)" - } -} job { id: "Android32 (more configs)" realm: "ci" @@ -300,16 +290,6 @@ job { builder: "Linux64 Release (Libfuzzer)" } } -job { - id: "Linux64 Release (reclient)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "Linux64 Release (reclient)" - } -} job { id: "Mac Asan" realm: "ci" @@ -350,16 +330,6 @@ job { builder: "Mac64 Release" } } -job { - id: "Mac64 Release (reclient)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "Mac64 Release (reclient)" - } -} job { id: "MacARM64 M1 Release" realm: "ci" @@ -616,16 +586,6 @@ job { builder: "Win64 Release (Clang)" } } -job { - id: "Win64 Release (Clang)(reclient)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "Win64 Release (Clang)(reclient)" - } -} job { id: "iOS API Framework Builder" realm: "ci" @@ -661,16 +621,6 @@ job { builder: "iOS64 Release" } } -job { - id: "iOS64 Release (reclient)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "iOS64 Release (reclient)" - } -} job { id: "iOS64 Sim Debug (iOS 12)" realm: "ci" @@ -707,7 +657,6 @@ trigger { acl_sets: "ci" triggers: "Android32 (M Nexus5X)" triggers: "Android32 (M Nexus5X)(dbg)" - triggers: "Android32 (M Nexus5X)(reclient)" triggers: "Android32 (more configs)" triggers: "Android32 Builder x86" triggers: "Android32 Builder x86 (dbg)" @@ -729,11 +678,9 @@ trigger { triggers: "Linux64 Release" triggers: "Linux64 Release (ARM)" triggers: "Linux64 Release (Libfuzzer)" - triggers: "Linux64 Release (reclient)" triggers: "Mac Asan" triggers: "Mac64 Debug" triggers: "Mac64 Release" - triggers: "Mac64 Release (reclient)" triggers: "MacARM64 M1 Release" triggers: "Win (more configs)" triggers: "Win32 Debug (Clang)" @@ -741,11 +688,9 @@ trigger { triggers: "Win64 ASan" triggers: "Win64 Debug (Clang)" triggers: "Win64 Release (Clang)" - triggers: "Win64 Release (Clang)(reclient)" triggers: "iOS API Framework Builder" triggers: "iOS64 Debug" triggers: "iOS64 Release" - triggers: "iOS64 Release (reclient)" triggers: "iOS64 Sim Debug (iOS 12)" triggers: "iOS64 Sim Debug (iOS 13)" triggers: "iOS64 Sim Debug (iOS 14)" diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index a939a3b439..50fe50629e 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -33,7 +33,6 @@ # Android 'Android32 (M Nexus5X)': 'android_release_bot_arm_reclient', 'Android32 (M Nexus5X)(dbg)': 'android_debug_static_bot_arm', - 'Android32 (M Nexus5X)(reclient)': 'android_release_bot_arm_reclient', 'Android32 (more configs)': { 'bwe_test_logging': 'bwe_test_logging_android_arm', 'dummy_audio_file_devices_no_protobuf': @@ -75,14 +74,12 @@ 'Linux64 Release': 'release_bot_x64_reclient', 'Linux64 Release (ARM)': 'release_bot_arm64', 'Linux64 Release (Libfuzzer)': 'libfuzzer_asan_release_bot_x64_reclient', - 'Linux64 Release (reclient)': 'release_bot_x64_reclient', # Mac 'Mac Asan': 'mac_asan_clang_release_bot_x64', 'Mac64 Builder': 'pure_release_bot_x64', 'Mac64 Debug': 'debug_bot_x64', 'Mac64 Release': 'release_bot_x64', - 'Mac64 Release (reclient)': 'release_bot_x64_reclient', 'MacARM64 M1 Release': 'release_bot_arm64', 'MacArm64 Builder': 'release_bot_arm64', @@ -99,12 +96,10 @@ 'Win64 ASan': 'win_asan_clang_release_bot_x64', 'Win64 Debug (Clang)': 'win_clang_debug_bot_x64', 'Win64 Release (Clang)': 'win_clang_release_bot_x64', - 'Win64 Release (Clang)(reclient)': 'win_clang_release_bot_x64_reclient', # iOS 'iOS64 Debug': 'ios_debug_bot_arm64', 'iOS64 Release': 'ios_release_bot_arm64', - 'iOS64 Release (reclient)': 'ios_release_bot_arm64_reclient', 'iOS64 Sim Debug (iOS 12)': 'ios_debug_bot_x64', 'iOS64 Sim Debug (iOS 13)': 'ios_debug_bot_x64', 'iOS64 Sim Debug (iOS 14)': 'ios_debug_bot_x64', @@ -285,9 +280,6 @@ 'ios_release_bot_arm64': [ 'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest', ], - 'ios_release_bot_arm64_reclient': [ - 'ios', 'release_bot_reclient', 'arm64', 'no_ios_code_signing', 'xctest', - ], 'libfuzzer_asan_release_bot_x64': [ 'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264', 'pure_release_bot', 'x64' @@ -361,12 +353,6 @@ 'release_bot', 'x64', ], - 'win_clang_release_bot_x64_reclient': [ - 'clang', - 'openh264', - 'release_bot_reclient', - 'x64', - ], 'win_clang_release_bot_x86': [ 'clang', 'openh264',