From 2c0376e20ceef4459295f873c18ff2f417f17bb1 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Wed, 18 Jan 2023 11:02:08 +0100 Subject: [PATCH] Run iOS sim bots on versions 14, 15 and 16. This CL removes the iOS sim bots 12, 13, 14 and replaces them with a unique bot that runs the test on iOS version 14, 15 and 16. Change-Id: I46673bad44c2c5539fbbf266cc9d5d468557022e Bug: b/264630045 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290999 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#39131} --- infra/config/commit-queue.cfg | 16 +- infra/config/config.star | 9 +- infra/config/cr-buildbucket.cfg | 336 +------------------------------- infra/config/luci-milo.cfg | 24 --- infra/config/luci-notify.cfg | 125 +----------- infra/config/luci-scheduler.cfg | 33 ---- 6 files changed, 10 insertions(+), 533 deletions(-) diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg index 79f43cee79..07eb7b5a9b 100644 --- a/infra/config/commit-queue.cfg +++ b/infra/config/commit-queue.cfg @@ -89,13 +89,7 @@ config_groups { experiment_percentage: 100 } builders { - name: "webrtc/try/ios_sim_x64_dbg_ios12" - } - builders { - name: "webrtc/try/ios_sim_x64_dbg_ios13" - } - builders { - name: "webrtc/try/ios_sim_x64_dbg_ios14" + name: "webrtc/try/ios_dbg_simulator" } builders { name: "webrtc/try/linux_asan" @@ -286,13 +280,7 @@ config_groups { experiment_percentage: 100 } builders { - name: "webrtc/try/ios_sim_x64_dbg_ios12" - } - builders { - name: "webrtc/try/ios_sim_x64_dbg_ios13" - } - builders { - name: "webrtc/try/ios_sim_x64_dbg_ios14" + name: "webrtc/try/ios_dbg_simulator" } builders { name: "webrtc/try/linux_asan" diff --git a/infra/config/config.star b/infra/config/config.star index 95486797b8..91cebc8db9 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -58,7 +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 = [ - "iOS Debug (simulator)", ] # Use LUCI Scheduler BBv2 names and add Scheduler realms configs. @@ -743,13 +742,7 @@ 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", cq = None) -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") -ios_try_job("ios_sim_x64_dbg_ios13") -ios_builder("iOS64 Sim Debug (iOS 12)", "iOS|x64|12") -ios_try_job("ios_sim_x64_dbg_ios12") +ios_try_job("ios_dbg_simulator") ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True) ios_try_job("ios_api_framework", recipe = "ios_api_framework") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 18d1612187..e28e82a087 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -1900,171 +1900,6 @@ buckets { } } } - builders { - name: "iOS64 Sim Debug (iOS 12)" - 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 13)" - 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 14)" - 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 {} - } - } - } } } buckets { @@ -2195,11 +2030,9 @@ buckets { ' "Win64 Debug (Clang)",' ' "Win64 Release (Clang)",' ' "iOS API Framework Builder",' + ' "iOS Debug (simulator)",' ' "iOS64 Debug",' - ' "iOS64 Release",' - ' "iOS64 Sim Debug (iOS 12)",' - ' "iOS64 Sim Debug (iOS 13)",' - ' "iOS64 Sim Debug (iOS 14)"' + ' "iOS64 Release"' ' ]' ' }' ' },' @@ -4184,171 +4017,6 @@ buckets { } } } - builders { - name: "ios_sim_x64_dbg_ios12" - 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_sim_x64_dbg_ios13" - 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_sim_x64_dbg_ios14" - 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: "linux_asan" swarming_host: "chromium-swarm.appspot.com" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index dd0a1c8b5a..d73111e9f6 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -71,21 +71,6 @@ consoles { category: "iOS|x64" short_name: "sim" } - builders { - name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 14)" - category: "iOS|x64" - short_name: "14" - } - builders { - name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 13)" - category: "iOS|x64" - short_name: "13" - } - builders { - name: "buildbucket/luci.webrtc.ci/iOS64 Sim Debug (iOS 12)" - category: "iOS|x64" - short_name: "12" - } builders { name: "buildbucket/luci.webrtc.ci/iOS API Framework Builder" category: "iOS|fat" @@ -503,15 +488,6 @@ consoles { builders { name: "buildbucket/luci.webrtc.try/ios_dbg_simulator" } - builders { - name: "buildbucket/luci.webrtc.try/ios_sim_x64_dbg_ios14" - } - builders { - name: "buildbucket/luci.webrtc.try/ios_sim_x64_dbg_ios13" - } - builders { - name: "buildbucket/luci.webrtc.try/ios_sim_x64_dbg_ios12" - } builders { name: "buildbucket/luci.webrtc.try/ios_api_framework" } diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 3893d48274..d3c5ed9e69 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -943,6 +943,11 @@ notifiers { name: "iOS Debug (simulator)" repository: "https://webrtc.googlesource.com/src" } + 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\\).*" + } } notifiers { notifications { @@ -998,87 +1003,6 @@ notifiers { failed_step_regexp_exclude: ".*\\(experimental\\).*" } } -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 Sim Debug (iOS 12)" - repository: "https://webrtc.googlesource.com/src" - } - 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\\).*" - } -} -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 Sim Debug (iOS 13)" - repository: "https://webrtc.googlesource.com/src" - } - 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\\).*" - } -} -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 Sim Debug (iOS 14)" - repository: "https://webrtc.googlesource.com/src" - } - 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\\).*" - } -} notifiers { notifications { on_new_status: FAILURE @@ -1781,45 +1705,6 @@ notifiers { name: "ios_dbg_simulator" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "ios_sim_x64_dbg_ios12" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "ios_sim_x64_dbg_ios13" - } -} -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - builders { - bucket: "try" - name: "ios_sim_x64_dbg_ios14" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 2729e98b74..f879b73a1b 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -664,36 +664,6 @@ job { builder: "iOS64 Release" } } -job { - id: "iOS64 Sim Debug (iOS 12)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "iOS64 Sim Debug (iOS 12)" - } -} -job { - id: "iOS64 Sim Debug (iOS 13)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "iOS64 Sim Debug (iOS 13)" - } -} -job { - id: "iOS64 Sim Debug (iOS 14)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "iOS64 Sim Debug (iOS 14)" - } -} trigger { id: "webrtc-gitiles-trigger-main" realm: "ci" @@ -735,9 +705,6 @@ trigger { triggers: "iOS Debug (simulator)" triggers: "iOS64 Debug" triggers: "iOS64 Release" - triggers: "iOS64 Sim Debug (iOS 12)" - triggers: "iOS64 Sim Debug (iOS 13)" - triggers: "iOS64 Sim Debug (iOS 14)" triggers: "Android32 Builder arm" triggers: "Android64 Builder arm64" triggers: "Fuchsia Builder"