diff --git a/infra/config/config.star b/infra/config/config.star index eb8164cf18..c932b9de14 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -817,8 +817,8 @@ win_try_job("win_compile_x86_clang_dbg") win_builder("Win32 Release (Clang)", "Win Clang|x86|rel") win_try_job("win_x86_clang_rel") win_try_job("win_compile_x86_clang_rel", cq = None) -win_builder("Win32 Builder (Clang)", ci_cat = None, perf_cat = "Win|x86|Builder|") -perf_builder("Perf Win7", "Win|x86|Tester|7", triggered_by = ["Win32 Builder (Clang)"]) +win_builder("Win64 Builder (Clang)", ci_cat = None, perf_cat = "Win|x64|Builder|") +perf_builder("Perf Win 10", "Win|x64|Tester|10", triggered_by = ["Win64 Builder (Clang)"]) win_builder("Win64 Debug (Clang)", "Win Clang|x64|dbg") win_try_job("win_x64_clang_dbg", cq = None) win_try_job("win_x64_clang_dbg_win10", cq = None) diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 7003daf32b..d9f21b48fe 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -3087,7 +3087,7 @@ buckets { } } builders { - name: "Perf Win7" + name: "Perf Win 10" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cores:2" @@ -3137,7 +3137,7 @@ buckets { } } builders { - name: "Win32 Builder (Clang)" + name: "Win64 Builder (Clang)" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index cd92f9aa0e..8b46a43137 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -369,13 +369,13 @@ consoles { short_name: "12" } builders { - name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)" - category: "Win|x86|Builder" + name: "buildbucket/luci.webrtc.perf/Win64 Builder (Clang)" + category: "Win|x64|Builder" } builders { - name: "buildbucket/luci.webrtc.perf/Perf Win7" - category: "Win|x86|Tester" - short_name: "7" + name: "buildbucket/luci.webrtc.perf/Perf Win 10" + category: "Win|x64|Tester" + short_name: "10" } header { links { diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index 8e77146f3c..dcd3b293cb 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -1516,7 +1516,7 @@ notifiers { } builders { bucket: "perf" - name: "Perf Win7" + name: "Perf Win 10" repository: "https://webrtc.googlesource.com/src" } } @@ -1538,7 +1538,7 @@ notifiers { } builders { bucket: "perf" - name: "Win32 Builder (Clang)" + name: "Win64 Builder (Clang)" repository: "https://webrtc.googlesource.com/src" } tree_closers { diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index b8cdab9e85..b1158747b3 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -564,7 +564,7 @@ job { } } job { - id: "Perf Win7" + id: "Perf Win 10" realm: "perf" acls { role: TRIGGERER @@ -578,7 +578,7 @@ job { buildbucket { server: "cr-buildbucket.appspot.com" bucket: "perf" - builder: "Perf Win7" + builder: "Perf Win 10" } } job { @@ -613,16 +613,6 @@ job { builder: "Win (more configs)" } } -job { - id: "Win32 Builder (Clang)" - realm: "perf" - acl_sets: "perf" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "perf" - builder: "Win32 Builder (Clang)" - } -} job { id: "Win32 Debug (Clang)" realm: "ci" @@ -653,6 +643,16 @@ job { builder: "Win64 ASan" } } +job { + id: "Win64 Builder (Clang)" + realm: "perf" + acl_sets: "perf" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "perf" + builder: "Win64 Builder (Clang)" + } +} job { id: "Win64 Debug (Clang)" realm: "ci" @@ -787,7 +787,7 @@ trigger { triggers: "Linux64 Builder" triggers: "Mac64 Builder" triggers: "MacArm64 Builder" - triggers: "Win32 Builder (Clang)" + triggers: "Win64 Builder (Clang)" gitiles { repo: "https://webrtc.googlesource.com/src" refs: "regexp:refs/heads/main" diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg index 4d06b292ed..c39fbdff61 100644 --- a/infra/config/realms.cfg +++ b/infra/config/realms.cfg @@ -122,7 +122,7 @@ realms { values: "Perf Linux Bionic" values: "Perf Mac 11" values: "Perf Mac M1 Arm64 12" - values: "Perf Win7" + values: "Perf Win 10" } } } diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index 9e9888755e..cb0a9a8478 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -795,7 +795,7 @@ } ] }, - "Perf Win7": { + "Perf Win 10": { "isolated_scripts": [ { "args": [ diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index f83e6471a4..b3114b97c5 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -365,7 +365,7 @@ 'isolated_scripts': 'webrtc_perf_tests', }, }, - 'Perf Win7': { + 'Perf Win 10': { 'os_type': 'win', 'mixins': diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index ab12245983..097af40d5b 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -91,10 +91,10 @@ 'dummy_audio_file_devices_no_protobuf_x86', 'rtti_no_sctp': 'rtti_no_sctp_no_unicode_win_x86', }, - 'Win32 Builder (Clang)': 'win_clang_pure_release_bot_x86', 'Win32 Debug (Clang)': 'win_clang_debug_bot_x86', 'Win32 Release (Clang)': 'win_clang_release_bot_x86', 'Win64 ASan': 'win_asan_clang_release_bot_x64', + 'Win64 Builder (Clang)': 'win_clang_pure_release_bot_x64', 'Win64 Debug (Clang)': 'win_clang_debug_bot_x64', 'Win64 Release (Clang)': 'win_clang_release_bot_x64', @@ -136,7 +136,7 @@ 'Perf Linux Trusty': 'release_bot_x64', 'Perf Mac 11': 'release_bot_x64', 'Perf Mac M1 Arm64 12': 'release_bot_x64', - 'Perf Win7': 'release_bot_x64', + 'Perf Win 10': 'release_bot_x64', }, 'internal.client.webrtc': { 'iOS64 Debug': 'ios_internal_debug_bot_arm64', @@ -345,11 +345,11 @@ 'debug_bot', 'x86', ], - 'win_clang_pure_release_bot_x86': [ + 'win_clang_pure_release_bot_x64': [ 'clang', 'openh264', 'pure_release_bot', - 'x86', + 'x64', ], 'win_clang_release_bot_x64': [ 'clang',