diff --git a/infra/config/config.star b/infra/config/config.star index 7f9782c399..627ce6b9e3 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -58,7 +58,10 @@ 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)", + "iOS64 Release (reclient)", ] # Use LUCI Scheduler BBv2 names and add Scheduler realms configs. @@ -556,6 +559,7 @@ def ci_builder( lkgr_builders.append(name) dimensions.update({"pool": "luci.webrtc.ci", "cpu": kwargs.pop("cpu", DEFAULT_CPU)}) properties = properties or {} + properties = dict(properties) # Avoid mutating the original dict. properties["builder_group"] = "client.webrtc" if use_reclient: properties.update(make_reclient_properties("rbe-webrtc-trusted")) @@ -703,6 +707,7 @@ 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", use_reclient = True) 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") @@ -730,6 +735,7 @@ 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", use_reclient = True) 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") @@ -782,6 +788,7 @@ 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", use_reclient = True) 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|") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 4c41a70f7a..9d2941812c 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -106,6 +106,52 @@ 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/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" @@ -1226,6 +1272,52 @@ 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/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" @@ -1701,6 +1793,61 @@ 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 53aa5345d7..2557da7cb3 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -21,6 +21,11 @@ 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" @@ -66,6 +71,11 @@ 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" @@ -181,6 +191,11 @@ 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" diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 7387e90fd4..69fd509516 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -58,6 +58,28 @@ notifiers { 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" + } +} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -701,6 +723,28 @@ notifiers { 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" + } +} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -971,6 +1015,28 @@ notifiers { 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" + } +} notifiers { notifications { on_new_status: INFRA_FAILURE diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index e388ba1122..3f79d70612 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -24,6 +24,16 @@ 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" @@ -330,6 +340,16 @@ 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" @@ -621,6 +641,16 @@ 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" @@ -657,6 +687,7 @@ 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)" @@ -681,6 +712,7 @@ trigger { 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)" @@ -691,6 +723,7 @@ trigger { 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)"