Add a memory waterfall win/asan bot (and matching trybot), src/ side

While here, also slightly reorganize chromium.memory console layout: - Consistently use OS as toplevel subcategory (so that we don't have the cros msan bots under "linux|cros" while the cros asan bots are under "asan|cros" - Order OSs in the same order as the per-os waterfalls appear on build.chromium.org: win, mac, linux, cros. In mb_config.pyl, remove obsolete 'x86' from win/asan config names, and stop explicitly passing 'x64' (it's the default). This adds the bot config, but it doesn't add any tests yet. I'll do this in a follow-up so that I can send try jobs before adding tests. Before tests are landed, the bot will do nothing. Bug: 869973 Change-Id: I68a1a401b3fef1532006e42ab7f0e80d1532aa94 Reviewed-on: https://chromium-review.googlesource.com/1163932 Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Reviewed-by: Ryan Tseng <hinoka@chromium.org> Cr-Commit-Position: refs/heads/master@{#581094}
marcosholgado · Aug 7, 2018 · 083e633 · 083e633
1 parent 2c8441e
commit 083e633
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 33 deletions.
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
@@ -1298,6 +1298,12 @@ buckets {
     builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-caches" name: "ios12-sdk-xcode-clang" }
 
     # Win bots.
+    builders {
+      name: "win-asan"
+      dimensions: "os:Windows-10"
+      dimensions: "cores:32"
+      mixins: "memory-ci"
+    }
     builders {
       name: "win-jumbo-rel"
       mixins: "win-ci"

diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
@@ -592,6 +592,24 @@ consoles {
     category: "chromium.chrome"
     short_name: "cro"
   }
+  builders {
+    name: "buildbot/chromium.memory/win-asan"
+    name: "buildbucket/luci.chromium.ci/win-asan"
+    category: "chromium.memory|win"
+    short_name: "asn"
+  }
+  builders {
+    name: "buildbot/chromium.memory/Mac ASan 64 Builder"
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
+    category: "chromium.memory|mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbot/chromium.memory/Mac ASan 64 Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
+    category: "chromium.memory|mac"
+    short_name: "tst"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
@@ -617,18 +635,6 @@ consoles {
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
-  builders {
-    name: "buildbot/chromium.memory/Linux ChromiumOS MSan Builder"
-    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
-    category: "chromium.memory|linux|cros"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbot/chromium.memory/Linux ChromiumOS MSan Tests"
-    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
-    category: "chromium.memory|linux|cros"
-    short_name: "tst"
-  }
   builders {
     name: "buildbot/chromium.memory/Linux MSan Builder"
     name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
@@ -648,27 +654,27 @@ consoles {
     short_name: "cfi"
   }
   builders {
-    name: "buildbot/chromium.memory/Mac ASan 64 Builder"
-    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
-    category: "chromium.memory|asan|mac"
+    name: "buildbot/chromium.memory/Linux Chromium OS ASan LSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
+    category: "chromium.memory|cros|asan"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.memory/Mac ASan 64 Tests (1)"
-    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
-    category: "chromium.memory|asan|mac"
+    name: "buildbot/chromium.memory/Linux Chromium OS ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
+    category: "chromium.memory|cros|asan"
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux Chromium OS ASan LSan Builder"
-    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
-    category: "chromium.memory|asan|cros"
+    name: "buildbot/chromium.memory/Linux ChromiumOS MSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
+    category: "chromium.memory|cros|msan"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux Chromium OS ASan LSan Tests (1)"
-    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
-    category: "chromium.memory|asan|cros"
+    name: "buildbot/chromium.memory/Linux ChromiumOS MSan Tests"
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
+    category: "chromium.memory|cros|msan"
     short_name: "tst"
   }
   builders {

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
@@ -242,6 +242,7 @@ trigger {
   triggers: "mac-jumbo-rel"
   triggers: "mac-views-rel"
   triggers: "win-annotator-rel"
+  triggers: "win-asan"
   triggers: "win-jumbo-rel"
 }
 
@@ -2079,6 +2080,16 @@ job {
   }
 }
 
+job {
+  id: "win-asan"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-asan"
+  }
+}
+
 job {
   id: "win-jumbo-rel"
   acl_sets: "default"

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -100,9 +100,9 @@
       'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static',
       'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on',
       'CFI Linux (icall)': 'cfi_full_diag_icall_release_static_dcheck_always_on',
-      'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_x86_release',
-      'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_x86_release',
-      'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_x86_release',
+      'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_release_tot',
+      'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_release_tot',
+      'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_release_tot',
 
       'linux-win_cross-rel': 'clang_tot_win_release_cross',
       'ToTAndroid': 'android_clang_tot_release_minimal_symbols',
@@ -353,6 +353,7 @@
       'Linux MSan Builder': 'msan_release_bot',
       'Linux TSan Builder': 'tsan_disable_nacl_release_bot',
       'Mac ASan 64 Builder': 'asan_disable_nacl_release_bot_dcheck_always_on',
+      'win-asan': 'asan_clang_fuzzer_static_v8_heap_release',
     },
 
     'chromium.perf': {
@@ -906,16 +907,20 @@
       'android_without_codecs', 'release_bot', 'minimal_symbols', 'strip_debug_info',
     ],
 
-    'asan_clang_edge_fuzzer_static_v8_heap_x86_release': [
-      'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'v8_heap', 'release', 'x64',
+    'asan_clang_edge_fuzzer_static_v8_heap_release_tot': [
+      'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'v8_heap', 'release',
     ],
 
-    'asan_clang_shared_v8_heap_x86_release': [
-      'asan', 'clang_tot', 'shared', 'v8_heap', 'release', 'x64',
+    'asan_clang_shared_v8_heap_release_tot': [
+      'asan', 'clang_tot', 'shared', 'v8_heap', 'release',
     ],
 
-    'asan_clang_fuzzer_static_v8_heap_x86_release': [
-      'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap', 'release', 'x64',
+    'asan_clang_fuzzer_static_v8_heap_release': [
+      'asan', 'fuzzer', 'static', 'v8_heap', 'release',
+    ],
+
+    'asan_clang_fuzzer_static_v8_heap_release_tot': [
+      'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap', 'release',
     ],
 
     'asan_dcheck_disable_nacl_release_bot': [