Add builders for win x64 asan.
Bug: webrtc:10696
Change-Id: I69e15e39a9d55a40219c907d75a03be531d751cf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139111
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
diff --git a/config.star b/config.star
index 86614a4..a37369f 100755
--- a/config.star
+++ b/config.star
@@ -556,7 +556,7 @@
win_builder("Win64 Release (Clang)", "Win Clang|x64|rel")
win_try_job("win_x64_clang_rel", cq = None)
win_try_job("win_compile_x64_clang_rel")
-win_builder("Win32 ASan", "Win Clang|x86|asan")
+win_builder("Win64 ASan", "Win Clang|x64|asan")
win_try_job("win_asan")
win_builder("Win64 UWP", ci_cat = None, fyi_cat = "")
win_try_job("win_x64_uwp", cq = None, try_cat = None, fyi_cat = "")
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6dd9770..6ca443d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -612,24 +612,6 @@
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: <
- name: "Win32 ASan"
- swarming_host: "chromium-swarm.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cpu:x86-64"
- dimensions: "os:Windows"
- dimensions: "pool:luci.webrtc.ci"
- recipe: <
- name: "webrtc/standalone"
- cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
- properties_j: "mastername:\"client.webrtc\""
- >
- priority: 30
- execution_timeout_secs: 7200
- build_numbers: YES
- service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- >
- builders: <
name: "Win32 Builder (Clang)"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -720,6 +702,24 @@
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: <
+ name: "Win64 ASan"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Windows"
+ dimensions: "pool:luci.webrtc.ci"
+ recipe: <
+ name: "webrtc/standalone"
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ properties_j: "mastername:\"client.webrtc\""
+ >
+ priority: 30
+ execution_timeout_secs: 7200
+ build_numbers: YES
+ service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ >
+ builders: <
name: "Win64 Debug"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index a6024cc..8ef4810 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -241,8 +241,8 @@
short_name: "rel"
>
builders: <
- name: "buildbucket/luci.webrtc.ci/Win32 ASan"
- category: "Win Clang|x86"
+ name: "buildbucket/luci.webrtc.ci/Win64 ASan"
+ category: "Win Clang|x64"
short_name: "asan"
>
builders: <
diff --git a/luci-notify.cfg b/luci-notify.cfg
index ce93761..9aad1b0 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -462,20 +462,6 @@
>
builders: <
bucket: "ci"
- name: "Win32 ASan"
- repository: "https://webrtc.googlesource.com/src"
- >
->
-notifiers: <
- notifications: <
- on_failure: true
- email: <
- recipients: "webrtc-sheriffs-robots@google.com"
- >
- template: "ci"
- >
- builders: <
- bucket: "ci"
name: "Win32 Builder (Clang)"
repository: "https://webrtc.googlesource.com/src"
>
@@ -546,6 +532,20 @@
>
builders: <
bucket: "ci"
+ name: "Win64 ASan"
+ repository: "https://webrtc.googlesource.com/src"
+ >
+>
+notifiers: <
+ notifications: <
+ on_failure: true
+ email: <
+ recipients: "webrtc-sheriffs-robots@google.com"
+ >
+ template: "ci"
+ >
+ builders: <
+ bucket: "ci"
name: "Win64 Debug"
repository: "https://webrtc.googlesource.com/src"
>
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 48d7a7d..7a69df4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -515,15 +515,6 @@
>
>
job: <
- id: "Win32 ASan"
- acl_sets: "ci"
- buildbucket: <
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.webrtc.ci"
- builder: "Win32 ASan"
- >
->
-job: <
id: "Win32 Builder (Clang)"
acl_sets: "ci"
buildbucket: <
@@ -569,6 +560,15 @@
>
>
job: <
+ id: "Win64 ASan"
+ acl_sets: "ci"
+ buildbucket: <
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.webrtc.ci"
+ builder: "Win64 ASan"
+ >
+>
+job: <
id: "Win64 Debug"
acl_sets: "ci"
buildbucket: <
@@ -725,12 +725,12 @@
triggers: "Mac64 Debug"
triggers: "Mac64 Release"
triggers: "Win (more configs)"
- triggers: "Win32 ASan"
triggers: "Win32 Builder (Clang)"
triggers: "Win32 Debug"
triggers: "Win32 Debug (Clang)"
triggers: "Win32 Release"
triggers: "Win32 Release (Clang)"
+ triggers: "Win64 ASan"
triggers: "Win64 Debug"
triggers: "Win64 Debug (Clang)"
triggers: "Win64 Release"