From b45d4deb3bb03dcc1da517334235cb17fa769bba Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Fri, 29 Apr 2022 10:22:53 +0200 Subject: [PATCH] Rename MacOS perf bot to 11 to reflect OS version Bug: b/227442116 Change-Id: I80cf745a3a38d08c833864d2f8e4533776be2585 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260460 Reviewed-by: Jeremy Leconte Commit-Queue: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#36702} --- infra/config/config.star | 2 +- infra/config/cr-buildbucket.cfg | 2 +- infra/config/luci-milo.cfg | 4 ++-- infra/config/luci-notify.cfg | 2 +- infra/config/luci-scheduler.cfg | 4 ++-- infra/config/realms.cfg | 2 +- infra/specs/client.webrtc.perf.json | 6 +++--- infra/specs/waterfalls.pyl | 4 ++-- tools_webrtc/mb/mb_config.pyl | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/infra/config/config.star b/infra/config/config.star index 6af48c2ded..5be2222eb8 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -755,7 +755,7 @@ mac_builder("Mac64 Release", "Mac|x64|rel") 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|") -perf_builder("Perf Mac 10.11", "Mac|x64|Tester|10.11", triggered_by = ["Mac64 Builder"]) +perf_builder("Perf Mac 11", "Mac|x64|Tester|11", triggered_by = ["Mac64 Builder"]) mac_builder("Mac Asan", "Mac|x64|asan") mac_try_job("mac_asan") mac_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 5448484ed3..cb1ab3553d 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -2591,7 +2591,7 @@ buckets { } } builders { - name: "Perf Mac 10.11" + name: "Perf Mac 11" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "os:Linux" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index 4a0e2f78e1..bc82dadfec 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -327,9 +327,9 @@ consoles { category: "Mac|x64|Builder" } builders { - name: "buildbucket/luci.webrtc.perf/Perf Mac 10.11" + name: "buildbucket/luci.webrtc.perf/Perf Mac 11" category: "Mac|x64|Tester" - short_name: "10.11" + short_name: "11" } builders { name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)" diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 87a6e440fa..51f7cf996e 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -1308,7 +1308,7 @@ notifiers { } builders { bucket: "perf" - name: "Perf Mac 10.11" + name: "Perf Mac 11" repository: "https://webrtc.googlesource.com/src" } } diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 87714e73c5..a546da5622 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -421,7 +421,7 @@ job { } } job { - id: "Perf Mac 10.11" + id: "Perf Mac 11" realm: "perf" acls { role: TRIGGERER @@ -435,7 +435,7 @@ job { buildbucket { server: "cr-buildbucket.appspot.com" bucket: "perf" - builder: "Perf Mac 10.11" + builder: "Perf Mac 11" } } job { diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg index 79a83ab6c2..98aac07791 100644 --- a/infra/config/realms.cfg +++ b/infra/config/realms.cfg @@ -104,7 +104,7 @@ realms { values: "Perf Android64 (M Nexus5X)" values: "Perf Android64 (O Pixel2)" values: "Perf Linux Bionic" - values: "Perf Mac 10.11" + values: "Perf Mac 11" values: "Perf Win7" } } diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index ead316d035..3ebba77428 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -374,7 +374,7 @@ } ] }, - "Perf Mac 10.11": { + "Perf Mac 11": { "isolated_scripts": [ { "args": [ @@ -400,7 +400,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac", + "os": "Mac-11", "pool": "WebRTC-perf" } ], @@ -435,7 +435,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac", + "os": "Mac-11", "pool": "WebRTC-perf" } ], diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 3648940d1f..5c8e4351bf 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -280,11 +280,11 @@ 'isolated_scripts': 'desktop_perf_tests', }, }, - 'Perf Mac 10.11': { + 'Perf Mac 11': { 'os_type': 'mac', 'mixins': [ - 'mac', 'x86-64', 'perf-pool', 'timeout-3h', + 'mac11', 'x86-64', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format' ], 'test_suites': { diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 0080ae23c5..471407807e 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -110,7 +110,7 @@ 'Perf Android64 (O Pixel2)': 'release_bot_x64', 'Perf Linux Trusty': 'release_bot_x64', 'Perf Linux Bionic': 'release_bot_x64', - 'Perf Mac 10.11': 'release_bot_x64', + 'Perf Mac 11': 'release_bot_x64', 'Perf Win7': 'release_bot_x64', },