[libfuzzer] Add new builders for linux32

This adds a release and debug builder for libfuzzer binaries with x86. The builders are directly added to the new fuzz console and not to chromium.fyi. Bug: 852428 Change-Id: I0d15566a45cc6a803f35e87b028fe7c98794ede9 Reviewed-on: https://chromium-review.googlesource.com/c/1382414 Reviewed-by: Sergiy Belozorov <sergiyb@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#617563}
Denger-Network · Dec 18, 2018 · 8137fdc · 8137fdc
1 parent 1a1d175
commit 8137fdc
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 0 deletions.
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
@@ -2331,6 +2331,18 @@ buckets {
       # mixins: "fuzz-ci"
       mixins: "libfuzzer"
     }
+    builders {
+      name: "Libfuzzer Upload Linux32 ASan Debug"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fuzz-ci"
+      mixins: "libfuzzer"
+    }
+    builders {
+      name: "Libfuzzer Upload Linux32 ASan"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "fuzz-ci"
+      mixins: "libfuzzer"
+    }
     builders {
       name: "Libfuzzer Upload Chrome OS ASan"
       dimensions: "os:Ubuntu-14.04"

diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
@@ -1478,6 +1478,16 @@ consoles {
     category: "libfuzz"
     short_name: "chromeos-asan"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan"
+    category: "libfuzz"
+    short_name: "linux32"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux32 ASan Debug"
+    category: "libfuzz"
+    short_name: "linux32-dbg"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Libfuzzer Upload Linux ASan"
     category: "libfuzz"

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
@@ -158,6 +158,8 @@ trigger {
   triggers: "Jumbo Win x64"
   triggers: "Leak Detection Linux"
   triggers: "Libfuzzer Upload Chrome OS ASan"
+  triggers: "Libfuzzer Upload Linux32 ASan Debug"
+  triggers: "Libfuzzer Upload Linux32 ASan"
   triggers: "Libfuzzer Upload Linux ASan Debug"
   triggers: "Libfuzzer Upload Linux ASan"
   triggers: "Libfuzzer Upload Linux MSan"
@@ -3223,6 +3225,32 @@ job {
   }
 }
 
+job {
+  id: "Libfuzzer Upload Linux32 ASan"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload32 Linux ASan"
+  }
+  triggering_policy: {
+    max_concurrent_invocations: 3
+  }
+}
+
+job {
+  id: "Libfuzzer Upload Linux32 ASan Debug"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Libfuzzer Upload32 Linux ASan Debug"
+  }
+  triggering_policy: {
+    max_concurrent_invocations: 3
+  }
+}
+
 job {
   id: "Libfuzzer Upload Linux ASan"
   acl_sets: "default"

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -168,6 +168,8 @@
       'Afl Upload Linux ASan': 'afl_asan_release_bot',
       'ChromiumOS ASAN Release': 'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot',
       'Libfuzzer Upload Chrome OS ASan': 'libfuzzer_chromeos_asan_release_bot',
+      'Libfuzzer Upload Linux32 ASan': 'libfuzzer_asan_release_bot_x86',
+      'Libfuzzer Upload Linux32 ASan Debug': 'libfuzzer_asan_debug_bot_x86',
       'Libfuzzer Upload Linux ASan': 'libfuzzer_asan_release_bot',
       'Libfuzzer Upload Linux ASan Debug': 'libfuzzer_asan_debug_bot',
       'Libfuzzer Upload Linux MSan': 'libfuzzer_msan_release_bot',
@@ -1293,6 +1295,10 @@
       'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing',
     ],
 
+    'libfuzzer_asan_debug_bot_x86': [
+      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86', 'x86_host',
+    ],
+
     'debug_trybot': [
       'debug_trybot',
     ],
@@ -1489,6 +1495,10 @@
       'libfuzzer', 'asan', 'shared_release_bot', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing',
     ],
 
+    'libfuzzer_asan_release_bot_x86': [
+      'libfuzzer', 'asan', 'shared_release_bot', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86', 'x86_host',
+    ],
+
     'libfuzzer_asan_release_trybot': [
       'libfuzzer', 'asan', 'shared_release_trybot', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing',
     ],
@@ -2274,5 +2284,9 @@
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
+
+    'x86_host': {
+      'gn_args': 'host_cpu="x86"',
+    },
   },
 }