[infra] Remove CQ shadow builders with reclient
Since all CQ builders have already migrated to reclient, the shadow builders are not necessary.
Bug: b/243594984
Change-Id: I350dd5f0fde82882b94488945d46eef378fb3545
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291301
Reviewed-by: Takuto Ikuta <tikuta@google.com>
Auto-Submit: Junji Watanabe <jwata@google.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39179}
diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg
index 07eb7b5..374e8ed 100644
--- a/infra/config/commit-queue.cfg
+++ b/infra/config/commit-queue.cfg
@@ -47,10 +47,6 @@
name: "webrtc/try/android_arm_rel"
}
builders {
- name: "webrtc/try/android_arm_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/android_chromium_compile"
}
builders {
@@ -85,10 +81,6 @@
name: "webrtc/try/ios_compile_arm64_rel"
}
builders {
- name: "webrtc/try/ios_compile_arm64_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/ios_dbg_simulator"
}
builders {
@@ -131,10 +123,6 @@
name: "webrtc/try/linux_rel"
}
builders {
- name: "webrtc/try/linux_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/linux_tsan2"
}
builders {
@@ -168,10 +156,6 @@
name: "webrtc/try/mac_rel_m1"
}
builders {
- name: "webrtc/try/mac_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/presubmit"
disable_reuse: true
}
@@ -191,10 +175,6 @@
name: "webrtc/try/win_compile_x64_clang_rel"
}
builders {
- name: "webrtc/try/win_compile_x64_clang_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/win_compile_x86_clang_dbg"
}
builders {
@@ -241,10 +221,6 @@
name: "webrtc/try/android_arm_rel"
}
builders {
- name: "webrtc/try/android_arm_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/android_compile_arm64_rel"
}
builders {
@@ -276,10 +252,6 @@
name: "webrtc/try/ios_compile_arm64_rel"
}
builders {
- name: "webrtc/try/ios_compile_arm64_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/ios_dbg_simulator"
}
builders {
@@ -316,10 +288,6 @@
name: "webrtc/try/linux_rel"
}
builders {
- name: "webrtc/try/linux_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/linux_tsan2"
}
builders {
@@ -350,10 +318,6 @@
name: "webrtc/try/mac_rel_m1"
}
builders {
- name: "webrtc/try/mac_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/presubmit"
disable_reuse: true
}
@@ -367,10 +331,6 @@
name: "webrtc/try/win_compile_x64_clang_rel"
}
builders {
- name: "webrtc/try/win_compile_x64_clang_rel_reclient"
- experiment_percentage: 100
- }
- builders {
name: "webrtc/try/win_compile_x86_clang_dbg"
}
builders {
diff --git a/infra/config/config.star b/infra/config/config.star
index 91cebc8..1363b93 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -712,7 +712,6 @@
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", cq = {"experiment_percentage": 100})
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 (O Pixel2)", "Android|arm|Tester|O Pixel2", triggered_by = ["Android32 Builder arm"])
@@ -740,7 +739,6 @@
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", cq = {"experiment_percentage": 100})
ios_builder("iOS Debug (simulator)", "iOS|x64|sim")
ios_try_job("ios_dbg_simulator")
ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
@@ -755,7 +753,6 @@
linux_try_job("linux_compile_dbg")
linux_builder("Linux64 Release", "Linux|x64|rel")
linux_try_job("linux_rel")
-linux_try_job("linux_rel_reclient", cq = {"experiment_percentage": 100})
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"])
@@ -796,7 +793,6 @@
mac_builder("Mac64 Release", "Mac|x64|rel")
mac_try_job("mac_rel")
-mac_try_job("mac_rel_reclient", cq = {"experiment_percentage": 100})
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|")
@@ -824,7 +820,6 @@
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", cq = {"experiment_percentage": 100})
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 e28e82a..ffa5dc3 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -3192,56 +3192,6 @@
}
}
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"
- 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"
swarming_tags: "vpython:native-python-wrapper"
@@ -3908,61 +3858,6 @@
}
}
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"
- 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_dbg_simulator"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -4783,57 +4678,6 @@
}
}
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"
- 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"
swarming_tags: "vpython:native-python-wrapper"
@@ -5489,56 +5333,6 @@
}
}
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"
- 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"
swarming_tags: "vpython:native-python-wrapper"
@@ -5849,57 +5643,6 @@
}
}
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"
- 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"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index d73111e..5830d2e 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -441,9 +441,6 @@
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"
}
builders {
@@ -483,9 +480,6 @@
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_dbg_simulator"
}
builders {
@@ -507,9 +501,6 @@
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"
}
builders {
@@ -567,9 +558,6 @@
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"
}
builders {
@@ -609,9 +597,6 @@
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"
}
builders {
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index d3c5ed9..e461d1f 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -1507,19 +1507,6 @@
}
builders {
bucket: "try"
- name: "android_arm_rel_reclient"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- builders {
- bucket: "try"
name: "android_chromium_compile"
}
}
@@ -1689,19 +1676,6 @@
}
builders {
bucket: "try"
- name: "ios_compile_arm64_rel_reclient"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- builders {
- bucket: "try"
name: "ios_dbg_simulator"
}
}
@@ -1910,19 +1884,6 @@
}
builders {
bucket: "try"
- name: "linux_rel_reclient"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- builders {
- bucket: "try"
name: "linux_tsan2"
}
}
@@ -2092,19 +2053,6 @@
}
builders {
bucket: "try"
- name: "mac_rel_reclient"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- builders {
- bucket: "try"
name: "presubmit"
}
}
@@ -2183,19 +2131,6 @@
}
builders {
bucket: "try"
- name: "win_compile_x64_clang_rel_reclient"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- builders {
- bucket: "try"
name: "win_compile_x86_clang_dbg"
}
}
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index bd5272c..5e9463d 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -153,7 +153,6 @@
'rtti_no_sctp': 'rtti_no_sctp_android_arm',
},
'android_arm_rel': 'android_release_bot_arm',
- 'android_arm_rel_reclient': 'android_release_bot_arm_reclient',
'android_compile_arm64_dbg': 'android_debug_static_bot_arm64',
'android_compile_arm64_rel': 'android_pure_release_bot_arm64',
'android_compile_arm_dbg': 'android_debug_static_bot_arm',
@@ -169,7 +168,6 @@
# iOS
'ios_compile_arm64_dbg': 'ios_debug_bot_arm64',
'ios_compile_arm64_rel': 'ios_release_bot_arm64',
- 'ios_compile_arm64_rel_reclient': 'ios_release_bot_arm64_reclient',
'ios_dbg_simulator': 'ios_debug_bot_x64',
# Linux
@@ -193,7 +191,6 @@
},
'linux_msan': 'msan_clang_release_bot_x64',
'linux_rel': 'release_bot_x64',
- 'linux_rel_reclient': 'release_bot_x64_reclient',
'linux_tsan2': 'tsan_clang_release_bot_x64',
'linux_ubsan': 'ubsan_clang_release_bot_x64',
'linux_ubsan_vptr': 'ubsan_vptr_clang_release_bot_x64',
@@ -208,14 +205,11 @@
'mac_dbg_m1': 'debug_bot_arm64',
'mac_rel': 'release_bot_x64',
'mac_rel_m1': 'release_bot_arm64',
- 'mac_rel_reclient': 'release_bot_x64_reclient',
# Windows
'win_asan': 'win_asan_clang_release_bot_x64',
'win_compile_x64_clang_dbg': 'win_clang_debug_bot_x64',
'win_compile_x64_clang_rel': 'win_clang_release_bot_x64',
- 'win_compile_x64_clang_rel_reclient':
- 'win_clang_release_bot_x64_reclient',
'win_compile_x86_clang_dbg': 'win_clang_debug_bot_x86',
'win_compile_x86_clang_rel': 'win_clang_release_bot_x86',
'win_x64_clang_dbg': 'win_clang_debug_bot_x64',
@@ -291,10 +285,6 @@
'ios_release_bot_arm64': [
'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest',
],
- 'ios_release_bot_arm64_reclient': [
- 'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest',
- 'no_goma', 'reclient',
- ],
'libfuzzer_asan_release_bot_x64_reclient': [
'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264',
'pure_release_bot_reclient', 'x64'
@@ -363,14 +353,6 @@
'release_bot',
'x64',
],
- 'win_clang_release_bot_x64_reclient': [
- 'clang',
- 'openh264',
- 'release_bot',
- 'x64',
- 'no_goma',
- 'reclient',
- ],
'win_clang_release_bot_x86': [
'clang',
'openh264',
@@ -450,9 +432,6 @@
'gn_args': 'is_msan=true msan_track_origins=2'
' instrumented_libraries_release = "xenial"',
},
- 'no_goma': {
- 'gn_args': 'use_goma=false',
- },
'no_ios_code_signing': {
'gn_args': 'ios_enable_code_signing=false',
},
