Add luci+compile+test configs for two fuchsia builders

* CI builder: fuchsia-x64-dbg * CQ builder (Experimental): fuchsia-compile-x64-dbg Related CL: crrev.com/c/1796483 Bug: 1001643 Change-Id: If7da449efc2e4426f0c57ab7eb3b9e1796efa3d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796885 Commit-Queue: Haiyang Pan <hypan@google.com> Reviewed-by: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#697351}
Denger-Network · Sep 17, 2019 · 29703eb · 29703eb
1 parent 8b0cd8e
commit 29703eb
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 19 deletions.
diff --git a/docs/infra/cq_builders.md b/docs/infra/cq_builders.md
@@ -312,6 +312,10 @@ as required builders.
 
   * Experimental percentage: 5
 
+* [fuchsia-compile-x64-dbg](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/fuchsia-compile-x64-dbg) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/fuchsia-compile-x64-dbg)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+fuchsia-compile-x64-dbg))
+
+  * Experimental percentage: 5
+
 * [ios-device](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/ios-device) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/ios-device)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+ios-device))
 
   https://crbug.com/739556; make this non-experimental ASAP.

diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg
@@ -363,6 +363,10 @@ config_groups {
         name: "chromium/try/chromeos-kevin-experimental-rel"
         experiment_percentage: 5
       }
+      builders {
+        name: "chromium/try/fuchsia-compile-x64-dbg"
+        experiment_percentage: 5
+      }
       # https://crbug.com/739556; make this non-experimental ASAP.
       builders {
         name: "chromium/try/ios-device"

diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
@@ -1608,6 +1608,12 @@ buckets {
       mixins: "builderless"
     }
 
+    builders {
+      name: "fuchsia-x64-dbg"
+      mixins: "linux-ci"
+      mixins: "builderless"
+    }
+
     builders {
       name: "Fuchsia x64"
       mixins: "linux-ci-goma-rbe-prod"
@@ -4391,11 +4397,16 @@ buckets {
       mixins: "goma-rbe-prod"
       name: "fuchsia-fyi-x64-rel"
     }
+    builders {
+      mixins: "builderless"
+      mixins: "linux-try"
+      name: "fuchsia-compile-x64-dbg"
+    }
     builders {
       mixins: "linux-try"
-      name: "fuchsia_x64"
       mixins: "builderless"
       mixins: "goma-rbe-prod"
+      name: "fuchsia_x64"
     }
     builders {
       mixins: "builderless"

diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
@@ -570,6 +570,10 @@ consoles {
     category: "chromium.linux|cast"
     short_name: "aud"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
     category: "chromium.linux|fuchsia|cast"
@@ -581,20 +585,20 @@ consoles {
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
-    category: "chromium.linux|fuchsia|misc"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
-    category: "chromium.linux|fuchsia|misc"
-    short_name: "x64"
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-dbg"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "dbg"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Deterministic Fuchsia (dbg)"
-    category: "chromium.linux|fuchsia|misc"
+    category: "chromium.linux|fuchsia|x64"
     short_name: "det"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
     category: "chromium.chromiumos|default"
@@ -993,6 +997,10 @@ consoles {
     category: "cast"
     short_name: "aud"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
+    category: "fuchsia|a64"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/fuchsia-arm64-cast"
     category: "fuchsia|cast"
@@ -1004,20 +1012,20 @@ consoles {
     short_name: "x64"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
-    category: "fuchsia|misc"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
-    category: "fuchsia|misc"
-    short_name: "x64"
+    name: "buildbucket/luci.chromium.ci/fuchsia-x64-dbg"
+    category: "fuchsia|x64"
+    short_name: "dbg"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Deterministic Fuchsia (dbg)"
-    category: "fuchsia|misc"
+    category: "fuchsia|x64"
     short_name: "det"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "fuchsia|x64"
+    short_name: "rel"
+  }
 }
 
 consoles {
@@ -4585,6 +4593,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-arm64-cast"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-compile-x64-dbg"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-fyi-arm64-rel"
   }
@@ -5193,6 +5204,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/fuchsia-compile-x64-dbg"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-l-nexus-5-32"
   }

diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
@@ -196,6 +196,10 @@ notifiers {
     name: "fuchsia-x64-cast"
     bucket: "ci"
   }
+  builders {
+    name: "fuchsia-x64-dbg"
+    bucket: "ci"
+  }
 }
 
 notifiers {

diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg
@@ -153,6 +153,7 @@ trigger {
   triggers: "fuchsia-arm64-cast"
   triggers: "Fuchsia ARM64"
   triggers: "fuchsia-x64-cast"
+  triggers: "fuchsia-x64-dbg"
   triggers: "Fuchsia x64"
   triggers: "GPU FYI Linux Builder (dbg)"
   triggers: "GPU FYI Linux Builder"
@@ -1530,6 +1531,16 @@ job {
   }
 }
 
+job {
+  id: "fuchsia-x64-dbg"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "fuchsia-x64-dbg"
+  }
+}
+
 job {
   id: "GPU FYI Linux Builder"
   acl_sets: "default"

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -440,6 +440,7 @@
       'Linux Builder': 'gpu_tests_release_bot',
       'fuchsia-arm64-cast': 'release_bot_fuchsia_arm64_cast',
       'fuchsia-x64-cast': 'release_bot_fuchsia_cast',
+      'fuchsia-x64-dbg': 'debug_bot_fuchsia_compile_only',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       # linux-jumbo-rel is identical to linux-rel for perf comparisons, except
       # for the jumbo part.
@@ -756,6 +757,7 @@
       'closure_compilation': 'closure_compilation',
       'fuchsia_arm64': 'release_trybot_fuchsia_arm64',
       'fuchsia-arm64-cast': 'release_trybot_fuchsia_arm64_cast',
+      'fuchsia-compile-x64-dbg': 'debug_trybot_fuchsia_compile_only',
       'fuchsia-fyi-arm64-rel': 'release_trybot_fuchsia_arm64',
       'fuchsia-fyi-x64-dbg': 'debug_trybot_fuchsia',
       'fuchsia-fyi-x64-rel': 'release_trybot_fuchsia',
@@ -1475,6 +1477,10 @@
       'debug_bot', 'fuchsia',
     ],
 
+    'debug_bot_fuchsia_compile_only': [
+      'debug_bot', 'fuchsia', 'compile_only',
+    ],
+
     'debug_bot_x86': [
       'debug_bot', 'x86',
     ],
@@ -1503,6 +1509,10 @@
       'debug_trybot', 'fuchsia',
     ],
 
+    'debug_trybot_fuchsia_compile_only': [
+      'debug_trybot', 'fuchsia', 'compile_only',
+    ],
+
     'debug_trybot_x86': [
       'debug_trybot', 'x86',
     ],