Rename Win 7 to Win 10 to reflect whats being benchmarked

Bug: None
Change-Id: If41eb2d47ee381afba66a9a62e1b7d9481df4efb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285465
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38763}
This commit is contained in:
Christoffer Jansson 2022-11-29 15:47:25 +01:00 committed by WebRTC LUCI CQ
parent b7a3d59813
commit a5e7941a57
9 changed files with 31 additions and 31 deletions

View File

@ -817,8 +817,8 @@ win_try_job("win_compile_x86_clang_dbg")
win_builder("Win32 Release (Clang)", "Win Clang|x86|rel") win_builder("Win32 Release (Clang)", "Win Clang|x86|rel")
win_try_job("win_x86_clang_rel") win_try_job("win_x86_clang_rel")
win_try_job("win_compile_x86_clang_rel", cq = None) win_try_job("win_compile_x86_clang_rel", cq = None)
win_builder("Win32 Builder (Clang)", ci_cat = None, perf_cat = "Win|x86|Builder|") win_builder("Win64 Builder (Clang)", ci_cat = None, perf_cat = "Win|x64|Builder|")
perf_builder("Perf Win7", "Win|x86|Tester|7", triggered_by = ["Win32 Builder (Clang)"]) perf_builder("Perf Win 10", "Win|x64|Tester|10", triggered_by = ["Win64 Builder (Clang)"])
win_builder("Win64 Debug (Clang)", "Win Clang|x64|dbg") 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", cq = None)
win_try_job("win_x64_clang_dbg_win10", cq = None) win_try_job("win_x64_clang_dbg_win10", cq = None)

View File

@ -3087,7 +3087,7 @@ buckets {
} }
} }
builders { builders {
name: "Perf Win7" name: "Perf Win 10"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper" swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:2" dimensions: "cores:2"
@ -3137,7 +3137,7 @@ buckets {
} }
} }
builders { builders {
name: "Win32 Builder (Clang)" name: "Win64 Builder (Clang)"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper" swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64" dimensions: "cpu:x86-64"

View File

@ -369,13 +369,13 @@ consoles {
short_name: "12" short_name: "12"
} }
builders { builders {
name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)" name: "buildbucket/luci.webrtc.perf/Win64 Builder (Clang)"
category: "Win|x86|Builder" category: "Win|x64|Builder"
} }
builders { builders {
name: "buildbucket/luci.webrtc.perf/Perf Win7" name: "buildbucket/luci.webrtc.perf/Perf Win 10"
category: "Win|x86|Tester" category: "Win|x64|Tester"
short_name: "7" short_name: "10"
} }
header { header {
links { links {

View File

@ -1516,7 +1516,7 @@ notifiers {
} }
builders { builders {
bucket: "perf" bucket: "perf"
name: "Perf Win7" name: "Perf Win 10"
repository: "https://webrtc.googlesource.com/src" repository: "https://webrtc.googlesource.com/src"
} }
} }
@ -1538,7 +1538,7 @@ notifiers {
} }
builders { builders {
bucket: "perf" bucket: "perf"
name: "Win32 Builder (Clang)" name: "Win64 Builder (Clang)"
repository: "https://webrtc.googlesource.com/src" repository: "https://webrtc.googlesource.com/src"
} }
tree_closers { tree_closers {

View File

@ -564,7 +564,7 @@ job {
} }
} }
job { job {
id: "Perf Win7" id: "Perf Win 10"
realm: "perf" realm: "perf"
acls { acls {
role: TRIGGERER role: TRIGGERER
@ -578,7 +578,7 @@ job {
buildbucket { buildbucket {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "perf" bucket: "perf"
builder: "Perf Win7" builder: "Perf Win 10"
} }
} }
job { job {
@ -613,16 +613,6 @@ job {
builder: "Win (more configs)" 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 { job {
id: "Win32 Debug (Clang)" id: "Win32 Debug (Clang)"
realm: "ci" realm: "ci"
@ -653,6 +643,16 @@ job {
builder: "Win64 ASan" 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 { job {
id: "Win64 Debug (Clang)" id: "Win64 Debug (Clang)"
realm: "ci" realm: "ci"
@ -787,7 +787,7 @@ trigger {
triggers: "Linux64 Builder" triggers: "Linux64 Builder"
triggers: "Mac64 Builder" triggers: "Mac64 Builder"
triggers: "MacArm64 Builder" triggers: "MacArm64 Builder"
triggers: "Win32 Builder (Clang)" triggers: "Win64 Builder (Clang)"
gitiles { gitiles {
repo: "https://webrtc.googlesource.com/src" repo: "https://webrtc.googlesource.com/src"
refs: "regexp:refs/heads/main" refs: "regexp:refs/heads/main"

View File

@ -122,7 +122,7 @@ realms {
values: "Perf Linux Bionic" values: "Perf Linux Bionic"
values: "Perf Mac 11" values: "Perf Mac 11"
values: "Perf Mac M1 Arm64 12" values: "Perf Mac M1 Arm64 12"
values: "Perf Win7" values: "Perf Win 10"
} }
} }
} }

View File

@ -795,7 +795,7 @@
} }
] ]
}, },
"Perf Win7": { "Perf Win 10": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [

View File

@ -365,7 +365,7 @@
'isolated_scripts': 'webrtc_perf_tests', 'isolated_scripts': 'webrtc_perf_tests',
}, },
}, },
'Perf Win7': { 'Perf Win 10': {
'os_type': 'os_type':
'win', 'win',
'mixins': 'mixins':

View File

@ -91,10 +91,10 @@
'dummy_audio_file_devices_no_protobuf_x86', 'dummy_audio_file_devices_no_protobuf_x86',
'rtti_no_sctp': 'rtti_no_sctp_no_unicode_win_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 Debug (Clang)': 'win_clang_debug_bot_x86',
'Win32 Release (Clang)': 'win_clang_release_bot_x86', 'Win32 Release (Clang)': 'win_clang_release_bot_x86',
'Win64 ASan': 'win_asan_clang_release_bot_x64', '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 Debug (Clang)': 'win_clang_debug_bot_x64',
'Win64 Release (Clang)': 'win_clang_release_bot_x64', 'Win64 Release (Clang)': 'win_clang_release_bot_x64',
@ -136,7 +136,7 @@
'Perf Linux Trusty': 'release_bot_x64', 'Perf Linux Trusty': 'release_bot_x64',
'Perf Mac 11': 'release_bot_x64', 'Perf Mac 11': 'release_bot_x64',
'Perf Mac M1 Arm64 12': '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': { 'internal.client.webrtc': {
'iOS64 Debug': 'ios_internal_debug_bot_arm64', 'iOS64 Debug': 'ios_internal_debug_bot_arm64',
@ -345,11 +345,11 @@
'debug_bot', 'debug_bot',
'x86', 'x86',
], ],
'win_clang_pure_release_bot_x86': [ 'win_clang_pure_release_bot_x64': [
'clang', 'clang',
'openh264', 'openh264',
'pure_release_bot', 'pure_release_bot',
'x86', 'x64',
], ],
'win_clang_release_bot_x64': [ 'win_clang_release_bot_x64': [
'clang', 'clang',