From b301b58b3fc8a7f790819c4986cc67bcc7d6e8e4 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 16 Nov 2022 14:19:53 +0000 Subject: [PATCH] Rename CI Android testers. This makes it easier to update devices in th e future (avoiding multiple CLs to change names, etc..). Bug: b/259076774 Change-Id: I20ae940823978fbae84495d266345e4990184130 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283720 Reviewed-by: Jeremy Leconte Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#38650} --- infra/config/config.star | 6 +++--- infra/config/cr-buildbucket.cfg | 12 ++++++------ infra/config/luci-milo.cfg | 6 +++--- infra/config/luci-notify.cfg | 6 +++--- infra/config/luci-scheduler.cfg | 18 +++++++++--------- infra/config/project.cfg | 2 +- infra/specs/client.webrtc.json | 8 ++++---- infra/specs/waterfalls.pyl | 8 ++++---- tools_webrtc/mb/mb_config.pyl | 8 ++++---- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/infra/config/config.star b/infra/config/config.star index c66d23b779..6bd262452f 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -703,10 +703,10 @@ ios_builder, ios_try_job = normal_builder_factory( # Actual builder configuration: -android_builder("Android32 (M Nexus5X)(dbg)", "Android|arm|dbg") +android_builder("Android32 (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", "Android|arm|rel") 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") @@ -716,7 +716,7 @@ perf_builder("Perf Android32 (O Pixel2)", "Android|arm|Tester|O Pixel2", trigger perf_builder("Perf Android32 (R Pixel5)", "Android|arm|Tester|R Pixel5", triggered_by = ["Android32 Builder arm"]) android_try_job("android_compile_arm64_dbg", cq = None) android_try_job("android_arm64_dbg", cq = None) -android_builder("Android64 (M Nexus5X)", "Android|arm64|rel") +android_builder("Android64", "Android|arm64|rel") android_try_job("android_arm64_rel") android_builder("Android64 Builder arm64", "Android|arm64|size", perf_cat = "Android|arm64|Builder|", prioritized = True) perf_builder("Perf Android64 (M Nexus5X)", "Android|arm64|Tester|M Nexus5X", triggered_by = ["Android64 Builder arm64"]) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 761b2a49d2..e4528a6db3 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -15,7 +15,7 @@ buckets { } swarming { builders { - name: "Android32 (M Nexus5X)" + name: "Android32" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" @@ -65,7 +65,7 @@ buckets { } } builders { - name: "Android32 (M Nexus5X)(dbg)" + name: "Android32 (dbg)" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" @@ -265,7 +265,7 @@ buckets { } } builders { - name: "Android64 (M Nexus5X)" + name: "Android64" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" @@ -2104,12 +2104,12 @@ buckets { ' },' ' "webrtc/ci": {' ' "builders": [' - ' "Android32 (M Nexus5X)",' - ' "Android32 (M Nexus5X)(dbg)",' + ' "Android32",' + ' "Android32 (dbg)",' ' "Android32 (more configs)",' ' "Android32 Builder x86",' ' "Android32 Builder x86 (dbg)",' - ' "Android64 (M Nexus5X)",' + ' "Android64",' ' "Android64 Builder x64 (dbg)",' ' "Linux (more configs)",' ' "Linux Asan",' diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index 6f2b8bdac1..09d75a4279 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -12,12 +12,12 @@ consoles { refs: "regexp:refs/heads/main" manifest_name: "REVISION" builders { - name: "buildbucket/luci.webrtc.ci/Android32 (M Nexus5X)(dbg)" + name: "buildbucket/luci.webrtc.ci/Android32 (dbg)" category: "Android|arm" short_name: "dbg" } builders { - name: "buildbucket/luci.webrtc.ci/Android32 (M Nexus5X)" + name: "buildbucket/luci.webrtc.ci/Android32" category: "Android|arm" short_name: "rel" } @@ -27,7 +27,7 @@ consoles { short_name: "size" } builders { - name: "buildbucket/luci.webrtc.ci/Android64 (M Nexus5X)" + name: "buildbucket/luci.webrtc.ci/Android64" category: "Android|arm64" short_name: "rel" } diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 3a33b239cc..609875d7e1 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -22,7 +22,7 @@ notifiers { } builders { bucket: "ci" - name: "Android32 (M Nexus5X)" + name: "Android32" repository: "https://webrtc.googlesource.com/src" } tree_closers { @@ -49,7 +49,7 @@ notifiers { } builders { bucket: "ci" - name: "Android32 (M Nexus5X)(dbg)" + name: "Android32 (dbg)" repository: "https://webrtc.googlesource.com/src" } tree_closers { @@ -157,7 +157,7 @@ notifiers { } builders { bucket: "ci" - name: "Android64 (M Nexus5X)" + name: "Android64" repository: "https://webrtc.googlesource.com/src" } tree_closers { diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 274b7c001c..3e79cddd12 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -5,23 +5,23 @@ # https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg job { - id: "Android32 (M Nexus5X)" + id: "Android32" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "Android32 (M Nexus5X)" + builder: "Android32" } } job { - id: "Android32 (M Nexus5X)(dbg)" + id: "Android32 (dbg)" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "Android32 (M Nexus5X)(dbg)" + builder: "Android32 (dbg)" } } job { @@ -70,13 +70,13 @@ job { } } job { - id: "Android64 (M Nexus5X)" + id: "Android64" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "Android64 (M Nexus5X)" + builder: "Android64" } } job { @@ -709,12 +709,12 @@ trigger { id: "webrtc-gitiles-trigger-main" realm: "ci" acl_sets: "ci" - triggers: "Android32 (M Nexus5X)" - triggers: "Android32 (M Nexus5X)(dbg)" + triggers: "Android32" + triggers: "Android32 (dbg)" triggers: "Android32 (more configs)" triggers: "Android32 Builder x86" triggers: "Android32 Builder x86 (dbg)" - triggers: "Android64 (M Nexus5X)" + triggers: "Android64" triggers: "Android64 Builder x64 (dbg)" triggers: "Fuchsia Release" triggers: "Linux (more configs)" diff --git a/infra/config/project.cfg b/infra/config/project.cfg index 60fd23d1c6..ef07d893f1 100644 --- a/infra/config/project.cfg +++ b/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.33.6" + version: "1.33.7" package_dir: "." config_dir: "." entry_point: "config.star" diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 757476b28c..d295001de4 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -1,7 +1,7 @@ { "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, - "Android32 (M Nexus5X)": { + "Android32": { "gtest_tests": [ { "merge": { @@ -516,7 +516,7 @@ } ] }, - "Android32 (M Nexus5X)(dbg)": { + "Android32 (dbg)": { "gtest_tests": [ { "merge": { @@ -1062,7 +1062,7 @@ "Android32 Builder arm": {}, "Android32 Builder x86": {}, "Android32 Builder x86 (dbg)": {}, - "Android64 (M Nexus5X)": { + "Android64": { "gtest_tests": [ { "merge": { @@ -1577,7 +1577,7 @@ } ] }, - "Android64 (M Nexus5X)(dbg)": { + "Android64 (dbg)": { "gtest_tests": [ { "merge": { diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 64fdf0d616..1086ecc8ec 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -11,7 +11,7 @@ 'name': 'client.webrtc', 'mixins': [], 'machines': { - 'Android32 (M Nexus5X)': { + 'Android32': { 'mixins': [ 'walleye', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' @@ -21,7 +21,7 @@ 'junit_tests': 'android_junit_tests', }, }, - 'Android32 (M Nexus5X)(dbg)': { + 'Android32 (dbg)': { 'mixins': [ 'walleye', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' @@ -43,7 +43,7 @@ 'Android32 Builder arm': {}, 'Android32 Builder x86': {}, 'Android32 Builder x86 (dbg)': {}, - 'Android64 (M Nexus5X)': { + 'Android64': { 'mixins': [ 'walleye', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' @@ -53,7 +53,7 @@ 'junit_tests': 'android_junit_tests', }, }, - 'Android64 (M Nexus5X)(dbg)': { + 'Android64 (dbg)': { 'mixins': [ 'walleye', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index e8acbce106..f01a7e23d6 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -31,8 +31,8 @@ }, 'client.webrtc': { # Android - 'Android32 (M Nexus5X)': 'android_release_bot_arm_reclient', - 'Android32 (M Nexus5X)(dbg)': 'android_debug_static_bot_arm', + 'Android32': 'android_release_bot_arm_reclient', + 'Android32 (dbg)': 'android_debug_static_bot_arm', 'Android32 (more configs)': { 'bwe_test_logging': 'bwe_test_logging_android_arm', 'dummy_audio_file_devices_no_protobuf': @@ -42,8 +42,8 @@ 'Android32 Builder arm': 'android_pure_release_bot_arm', 'Android32 Builder x86': 'android_release_bot_x86', 'Android32 Builder x86 (dbg)': 'android_debug_static_bot_x86', - 'Android64 (M Nexus5X)': 'android_release_bot_arm64', - 'Android64 (M Nexus5X)(dbg)': 'android_debug_static_bot_arm64', + 'Android64': 'android_release_bot_arm64', + 'Android64 (dbg)': 'android_debug_static_bot_arm64', 'Android64 Builder arm64': 'android_pure_release_bot_arm64', 'Android64 Builder x64 (dbg)': 'android_debug_static_bot_x64',